Calculation fix