Hotfix tax calculation