Another tax calc bug fix