Fix for Barcode