Fixed double shipper issue