Fix on unit conversion