diff --git a/shopfloor_single_product_transfer/services/single_product_transfer.py b/shopfloor_single_product_transfer/services/single_product_transfer.py
index aa676f6358..2872821614 100644
--- a/shopfloor_single_product_transfer/services/single_product_transfer.py
+++ b/shopfloor_single_product_transfer/services/single_product_transfer.py
@@ -873,10 +873,12 @@ def scan_product(self, barcode, location_id=None, package_id=None):
             .search([("location_id", "=", location.id or package.location_id.id)])
             .product_id
         )
+        # TODO: Find a better way to manager multi valued barcodes
+        # in order to find in a single call all records (product, lot, ....)
         handlers_by_type = {
+            "lot": self._scan_product__scan_lot,
             "product": self._scan_product__scan_product,
             "packaging": self._scan_product__scan_packaging,
-            "lot": self._scan_product__scan_lot,
         }
         try:
             search = self._actions_for("search").for_products(products)