Fixed subtotals repeating issue