Custom Shipment status fix