Fixes issue with shipment number generation