diff --git a/codeflash/languages/java/support.py b/codeflash/languages/java/support.py
index f56a0dab5..d6e9ac779 100644
--- a/codeflash/languages/java/support.py
+++ b/codeflash/languages/java/support.py
@@ -260,12 +260,10 @@ def _build_runtime_map(self, inv_id_runtimes: dict[InvocationId, list[int]]) ->
 
             key = test_qualified_name
             if inv_id.iteration_id:
-                parts = inv_id.iteration_id.split("_")
-                cur_invid = parts[0] if len(parts) < 3 else "_".join(parts[:-1])
+                cur_invid = inv_id.iteration_id.rsplit("_", 1)[0]
                 key = key + "#" + cur_invid
-            if key not in unique_inv_ids:
-                unique_inv_ids[key] = 0
-            unique_inv_ids[key] += min(runtimes)
+            min_runtime = min(runtimes)
+            unique_inv_ids[key] = unique_inv_ids.get(key, 0) + min_runtime
         return unique_inv_ids
 
     # === Test Result Comparison ===
diff --git a/codeflash/languages/registry.py b/codeflash/languages/registry.py
index 38688cab6..e32bb5c16 100644
--- a/codeflash/languages/registry.py
+++ b/codeflash/languages/registry.py
@@ -56,7 +56,7 @@ def _ensure_languages_registered() -> None:
         from codeflash.languages.javascript import support as _
 
     with contextlib.suppress(ImportError):
-        from codeflash.languages.java import support as _
+        from codeflash.languages.java import support as _  # noqa: F401
 
     _languages_registered = True