#830 Fixing barcode issue