Fix in calculations