Fix date or shipment