FIX: Passengers and cargo would sometimes go missing when loading