Restored SKIP_N_BARCODES functionality and corrected a logic error