diff --git a/dpgen2/entrypoint/submit.py b/dpgen2/entrypoint/submit.py
index 8c8fa302..079d3f7e 100644
--- a/dpgen2/entrypoint/submit.py
+++ b/dpgen2/entrypoint/submit.py
@@ -797,8 +797,10 @@ def get_superop(key):
         return key.replace("prep-caly-input", "prep-run-explore")
     elif "collect-run-calypso-" in key:
         return re.sub("collect-run-calypso-[0-9]*-[0-9]*", "prep-run-explore", key)
-    elif "prep-run-dp-optim-" in key:
-        return re.sub("prep-run-dp-optim-[0-9]*-[0-9]*", "prep-run-explore", key)
+    elif "prep-dp-optim-" in key:
+        return re.sub("prep-dp-optim-[0-9]*-[0-9]*", "prep-run-explore", key)
+    elif "run-dp-optim-" in key:
+        return re.sub("run-dp-optim-[0-9]*-[0-9]*-[0-9]*", "prep-run-explore", key)
     elif "run-caly-model-devi" in key:
         return key.replace("run-caly-model-devi", "prep-run-explore")
     return None
@@ -843,7 +845,8 @@ def get_resubmit_keys(
             "modify-train-script",
             "prep-caly-input",
             "collect-run-calypso",
-            "prep-run-dp-optim",
+            "prep-dp-optim",
+            "run-dp-optim",
             "run-caly-model-devi",
             "prep-run-explore",
             "prep-lmp",
diff --git a/dpgen2/op/collect_run_caly.py b/dpgen2/op/collect_run_caly.py
index eeaf87b9..80332c5c 100644
--- a/dpgen2/op/collect_run_caly.py
+++ b/dpgen2/op/collect_run_caly.py
@@ -232,7 +232,7 @@ def normalize_config(data={}):
 
 
 def prep_last_calypso_file(step, results, opt_results_dir, qhull_input, vsc):
-    if step is not None and results is not None or opt_results_dir is not None:
+    if step is not None and results is not None and opt_results_dir is not None:
         Path(step.name).symlink_to(step)
         Path(results.name).symlink_to(results)
         assert isinstance(opt_results_dir, list), "opt_results_dir should be a list."