Unfortunately Trump has no ability to think about a future past tomorrow much less one that benefits anyone other than himself, so there’s no chance this will be fixed until he’s replaced.