Total Calculate Bug Fixed