Fix for new shipment crash