Passenger generation fix