Fixed Calculation bug