Use item_total to calculate subtotal fixes #2620

#2620