Fixed VAT issue. Revert config options back to normal