Bugfix for shipment relationship