shipment bugfix