diff --git a/generate_all_hyteg_forms.py b/generate_all_hyteg_forms.py
index 96a7b26eb39154703894decfc277c43985f44f9d..ae86507242d4a50f533c1e24cbe19fa7727f5081 100644
--- a/generate_all_hyteg_forms.py
+++ b/generate_all_hyteg_forms.py
@@ -166,8 +166,8 @@ class FormInfo:
         sub_dir = "p1"
         if self.trial_family == "N1E1":
             sub_dir = "n1e1"
-        elif self.trial_family == "P2 enhanced with Bubble":
-            return "p2_plus_bubble"
+        elif self.trial_family == "P2 enhanced with Bubble" and self.test_family == "P2 enhanced with Bubble":
+            sub_dir = "p2"
         elif self.trial_degree == self.test_degree:
             sub_dir = f"p{self.trial_degree}"
         else: