CBA: Fixed issue with tax being passed as product when multiple tax rates are used