Fix tax calculation