Return shipment bug fix