Fixing multiple unit conversion