Fix subtotal calculations.