Revert "Revert "Trying to fix unscannable barcode""

This reverts commit bd677ecf8adce7a28f8d95e89a45cfc50c60ad4f.