Fix in unit calculation