Only fix needed to "unbreak" Social Security:

Remove the income cap limit. ( https://www.fool.com/investing/2017/12/10/what-is-the-2018-m...)

All income over $128K is does not have a social security tax on it.

Remove the cap and there will be no problem.