Fixes #8485 - Taxable containers