Fix onboard departure