Fix barcode reader issue