The Best Way to Fix & Avoid a Tax Surprise