make some changes to keep working due the fixes on the shipment process