Barcode scanner fix