No that does not fix the issue.

If you have capital rather than income then this is still better for you.

e.g. a retiree has capital but not income and for someone like Musk will have plenty of capital but proportionally much ledd income as that will be the best way to avoid tax.