diff --git a/opendm/osfm.py b/opendm/osfm.py
index 9d47291a..456b4eb1 100644
--- a/opendm/osfm.py
+++ b/opendm/osfm.py
@@ -284,15 +284,16 @@ def get_submodel_argv(project_name = None, submodels_path = None, submodel_name
         
         if i == 1 and project_name and submodel_name and arg == project_name:
             i += 1
+            continue
         elif i == len(argv) - 1:
             # Project name?
             if project_name and submodel_name and arg == project_name:
                 result.append(submodel_name)
                 found_args['project_name'] = True
-            elif arg.startswith("--"):
-                result.append(arg)
-            i += 1
-        elif arg == '--project-path':
+                i += 1
+                continue
+        
+        if arg == '--project-path':
             if submodels_path:
                 result.append(arg)
                 result.append(submodels_path)