Correct total calculations