Quick fix to barcode stuff