Better fix for barcode issue