Fixed issue with barcode by adding a default NONE