You might also want to factor the relative marginal utility of a dollar.

But yes, that part does seem solvable with a correction like that even if my preferred fix would be removing the billionaires ;)