Tax bug fix