diff --git a/config/machine_settings/defaults.ini b/config/machine_settings/defaults.ini
index b73dde6..73f8223 100644
--- a/config/machine_settings/defaults.ini
+++ b/config/machine_settings/defaults.ini
@@ -111,7 +111,7 @@ codice_a_barre:
 avvitatura_abilitata:
 viti: 0
 istruzione_abilitata:
-n_componenti:1
+n_componenti: 1
 verifica_resistenza_connettore_abilitata: x
 scala_resistenza: 500
 r nominale: 1000000000
diff --git a/config/machine_settings/st-ten-10.ini b/config/machine_settings/st-ten-10.ini
index 8411acf..dcff6c8 100644
--- a/config/machine_settings/st-ten-10.ini
+++ b/config/machine_settings/st-ten-10.ini
@@ -77,7 +77,7 @@ pressione_di_test_delta_massimo: 30
 tempo_svuotamento: 1
 pressione_svuotamento: 100
 canale_di_prova: 0
-n_componenti:1
+n_componenti: 1
 tester_discharge_enable: yes
 
 [autotest_leak]
diff --git a/src/ui/recipe_selection/recipe_selection.py b/src/ui/recipe_selection/recipe_selection.py
index 4cee38d..9c7b2e1 100755
--- a/src/ui/recipe_selection/recipe_selection.py
+++ b/src/ui/recipe_selection/recipe_selection.py
@@ -202,11 +202,11 @@ class Recipe_Selection(Widget):
             },
             "barcodes": {
                 "serial": row.get(barcode_serial_field, defaults["codice_a_barre"]),
+                "n_pieces": row.get("n_componenti") or defaults["n_componenti"],
                 "barcode_input_2": row.get("barcode_input_2", "-"),
                 "barcode_input_3": row.get("barcode_input_3", "-"),
                 "barcode_input_4": row.get("barcode_input_4", "-"),
                 "barcode_input_5": row.get("barcode_input_5", "-"),
-                "n_pieces": row.get("n_componenti") if self.config["hardware_config"]["leak_disabled"] == "active" else defaults["n_componenti"],
             },
             "resistance": {
                 "scale": locale.atof(row.get("scala_resistenza", defaults["scala_resistenza"])),
diff --git a/src/ui/test/test.py b/src/ui/test/test.py
index be601ea..b4a379c 100755
--- a/src/ui/test/test.py
+++ b/src/ui/test/test.py
@@ -51,6 +51,7 @@ class Test(Widget):
         # INIT RECIPE
         self.recipe = None
 
+
         if self.config["hardware_config"]["barcode_recipe_selection"] == "present":
             self.recipe_selection_mode = "barcode"
         else:
@@ -97,7 +98,7 @@ class Test(Widget):
             "count": Test_Assembly(img_path=None, text=u"INSERIRE IL NUMERO DI PEZZI ATTESI PER IL LOTTO",
                                    widget=Test_Count(components=self.components, recipe=self.recipe, step=self.step, pieces=self.pieces, run_once=True)),
             "warning_img": Test_Assembly(img_path=None, text=u"ATTENZIONE - PER QUESTO CODICE ESEGUIRE LE OPERAZIONI INDICATE IN FIGURA",
-                                         widget=Test_Warning_Img(components=self.components, recipe=self.recipe,bench_name=self.config.machine_id, step=self.step, run_once=True)),
+                                         widget=Test_Warning_Img(components=self.components, recipe=self.recipe,bench_name=self.config["machine"]["image_for_warning"], step=self.step, run_once=True)),
             "count_end": Test_Assembly(img_path=None, text=u"LOTTO TERMINATO, PREMERE CONTINUA PERCOMINCIARNE UNO NUOVO",
                                        widget=Test_Count_End(components=self.components, recipe=self.recipe, step=self.step, pieces=self.pieces)),
             "done": Test_Assembly(img_path=self.select_step_img("success"), text=u"COLLAUDO COMPLETATO", widget=None),
@@ -394,8 +395,9 @@ class Test(Widget):
                     else:
                         step.spec["barcode_name"] = barcode_names[(n_pieces_adapted - 1) % len(barcode_names)]
                         n_pieces_adapted -= 1
-                        step.spec["n_pieces"] = str(n_pieces_adapted)
-                        new_barcode_step = copy.deepcopy(step)  # create a deep copy of the step
+                        new_barcode_step = copy.deepcopy(step)
+                        new_barcode_step.spec["n_pieces"] = str(n_pieces_adapted)
+                        n_pieces_adapted -= 1
                         steps.insert(i + 1, new_barcode_step)
                 if i in skip:
                     continue
diff --git a/src/ui/test_barcodes/test_barcodes.py b/src/ui/test_barcodes/test_barcodes.py
index 7a87e20..2ce80ed 100644
--- a/src/ui/test_barcodes/test_barcodes.py
+++ b/src/ui/test_barcodes/test_barcodes.py
@@ -33,9 +33,7 @@ class Test_Barcodes(Test_Test):
         self.start_counter += 1
         npieces = self.step.spec.get("n_pieces")
         npieces = int(npieces) if npieces is not None else 0
-        if self.start_counter > npieces + 1:  # If start_counter exceeds npieces + 1
-            self.start_counter = 1
-        display_str = "{}/{}".format(self.start_counter, npieces + 1)
+        display_str = "PEZZI RIMANENTI {}".format(npieces)
         self.counter_l.setText(display_str)
         if show is False:
             return show
@@ -77,7 +75,6 @@ class Test_Barcodes(Test_Test):
         barcode_ok = False
         self.current_step_barcode_name = self.step.spec.get('barcode_name')  # get current step's barcode name
         barcode_check = self.barcodes_spec.get(self.current_step_barcode_name)
-        #self.expected_barcode.setText(self.step.spec.get(self.current_step_barcode_name))
 
         # If the current step's barcode type exists in barcodes_spec and it's valid, store it
         if barcode_check and barcode_check(data):