Fix calculations
Fix calculation