Fix return flight bug