diff --git a/QgisModelBaker/gui/workflow_wizard/workflow_wizard.py b/QgisModelBaker/gui/workflow_wizard/workflow_wizard.py
index 5281860bc..57d78d047 100644
--- a/QgisModelBaker/gui/workflow_wizard/workflow_wizard.py
+++ b/QgisModelBaker/gui/workflow_wizard/workflow_wizard.py
@@ -589,7 +589,9 @@ def get_topping_file_model(self, id_list):
 
         # we wait for the download or we timeout after 30 seconds and we apply what we have
         loop = QEventLoop()
-        topping_file_cache.download_finished.connect(lambda: loop.quit())
+        topping_file_cache.download_finished_and_model_fresh.connect(
+            lambda: loop.quit()
+        )
         timer = QTimer()
         timer.setSingleShot(True)
         timer.timeout.connect(lambda: loop.quit())
@@ -598,8 +600,8 @@ def get_topping_file_model(self, id_list):
         topping_file_cache.refresh()
         self.log_panel.print_info(self.tr("- - Downloading…"), LogColor.COLOR_TOPPING)
 
-        if len(topping_file_cache.downloaded_files) != len(id_list):
-            loop.exec()
+        # we wait for the download_finished_and_model_fresh signal, because even when the files are local, it should only continue when both is ready
+        loop.exec()
 
         if len(topping_file_cache.downloaded_files) == len(id_list):
             self.log_panel.print_info(
diff --git a/scripts/package_pip_packages.sh b/scripts/package_pip_packages.sh
index be122fa70..e7dfdc845 100755
--- a/scripts/package_pip_packages.sh
+++ b/scripts/package_pip_packages.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 LIBS_DIR="QgisModelBaker/libs"
 
-MODELBAKER_LIBRARY=("modelbaker" "1.7.0")
+MODELBAKER_LIBRARY=("modelbaker" "1.7.1")
 PACKAGING=("packaging" "21.3")
 
 PACKAGES=(