Really fix shipment number generation

Fixes #4063

(really)