Barcode checker fix as it was applied in master