Added an extra check to disable the barcode