Fixed Subtotal

Changed when counter is incremented so that the subtotal values are
correct.