Fix shipment id bug