Fix wrong movement behavior with shipment