Fix to Tax issue