Moved UnitInVehicle check