Fixed optional tax assignment