Partially fix choosing vehicles as carriers even if vehicle carrying is off