Only real fix is to repeal the 17th Amendment and eliminate the Senior Executive Service
And the 19th. It’s a clearly failed experiment, just like the 18th.