GetShipmentSuffix() fix