Fixed a bug in shipment