Use new constants
FIX nasty bug that generated barcodes that were not valid