diff --git a/src/fdr/teddy.c b/src/fdr/teddy.c
index 57fcaef1..462b57df 100644
--- a/src/fdr/teddy.c
+++ b/src/fdr/teddy.c
@@ -228,7 +228,7 @@ hwlm_error_t fdr_exec_teddy_msks1(const struct FDR *fdr,
         m128 r_0 = prep_conf_teddy_m1(maskBase, p_mask, val_0);
         CONFIRM_TEDDY(r_0, 8, 0, VECTORING, do_confWithBit1_teddy);
     }
-    *a->groups = control;
+
     return HWLM_SUCCESS;
 }
 
@@ -282,7 +282,7 @@ hwlm_error_t fdr_exec_teddy_msks1_pck(const struct FDR *fdr,
         m128 r_0 = prep_conf_teddy_m1(maskBase, p_mask, val_0);
         CONFIRM_TEDDY(r_0, 8, 0, VECTORING, do_confWithBit_teddy);
     }
-    *a->groups = control;
+
     return HWLM_SUCCESS;
 }
 
@@ -340,7 +340,7 @@ hwlm_error_t fdr_exec_teddy_msks2(const struct FDR *fdr,
         m128 r_0 = prep_conf_teddy_m2(maskBase, &res_old_1, p_mask, val_0);
         CONFIRM_TEDDY(r_0, 8, 0, VECTORING, do_confWithBitMany_teddy);
     }
-    *a->groups = control;
+
     return HWLM_SUCCESS;
 }
 
@@ -398,7 +398,7 @@ hwlm_error_t fdr_exec_teddy_msks2_pck(const struct FDR *fdr,
         m128 r_0 = prep_conf_teddy_m2(maskBase, &res_old_1, p_mask, val_0);
         CONFIRM_TEDDY(r_0, 8, 0, VECTORING, do_confWithBit_teddy);
     }
-    *a->groups = control;
+
     return HWLM_SUCCESS;
 }
 
@@ -459,7 +459,7 @@ hwlm_error_t fdr_exec_teddy_msks3(const struct FDR *fdr,
                                       p_mask, val_0);
         CONFIRM_TEDDY(r_0, 8, 0, VECTORING, do_confWithBitMany_teddy);
     }
-    *a->groups = control;
+
     return HWLM_SUCCESS;
 }
 
@@ -520,7 +520,7 @@ hwlm_error_t fdr_exec_teddy_msks3_pck(const struct FDR *fdr,
                                       p_mask, val_0);
         CONFIRM_TEDDY(r_0, 8, 0, VECTORING, do_confWithBit_teddy);
     }
-    *a->groups = control;
+
     return HWLM_SUCCESS;
 }
 
@@ -582,7 +582,7 @@ hwlm_error_t fdr_exec_teddy_msks4(const struct FDR *fdr,
                                       &res_old_3, p_mask, val_0);
         CONFIRM_TEDDY(r_0, 8, 0, VECTORING, do_confWithBitMany_teddy);
     }
-    *a->groups = control;
+
     return HWLM_SUCCESS;
 }
 
@@ -644,6 +644,6 @@ hwlm_error_t fdr_exec_teddy_msks4_pck(const struct FDR *fdr,
                                       &res_old_3, p_mask, val_0);
         CONFIRM_TEDDY(r_0, 8, 0, VECTORING, do_confWithBit_teddy);
     }
-    *a->groups = control;
+
     return HWLM_SUCCESS;
 }
diff --git a/src/fdr/teddy_avx2.c b/src/fdr/teddy_avx2.c
index 8f52027d..52e75cb4 100644
--- a/src/fdr/teddy_avx2.c
+++ b/src/fdr/teddy_avx2.c
@@ -531,7 +531,7 @@ hwlm_error_t fdr_exec_teddy_avx2_msks1_fat(const struct FDR *fdr,
         m256 r_0 = prep_conf_fat_teddy_m1(maskBase, p_mask, val_0);
         CONFIRM_FAT_TEDDY(r_0, 16, 0, VECTORING, do_confWithBit1_teddy);
     }
-    *a->groups = control;
+
     return HWLM_SUCCESS;
 }
 
@@ -586,7 +586,7 @@ hwlm_error_t fdr_exec_teddy_avx2_msks1_pck_fat(const struct FDR *fdr,
         m256 r_0 = prep_conf_fat_teddy_m1(maskBase, p_mask, val_0);
         CONFIRM_FAT_TEDDY(r_0, 16, 0, VECTORING, do_confWithBit_teddy);
     }
-    *a->groups = control;
+
     return HWLM_SUCCESS;
 }
 
@@ -644,7 +644,7 @@ hwlm_error_t fdr_exec_teddy_avx2_msks2_fat(const struct FDR *fdr,
         m256 r_0 = prep_conf_fat_teddy_m2(maskBase, &res_old_1, p_mask, val_0);
         CONFIRM_FAT_TEDDY(r_0, 16, 0, VECTORING, do_confWithBitMany_teddy);
     }
-    *a->groups = control;
+
     return HWLM_SUCCESS;
 }
 
@@ -702,7 +702,7 @@ hwlm_error_t fdr_exec_teddy_avx2_msks2_pck_fat(const struct FDR *fdr,
         m256 r_0 = prep_conf_fat_teddy_m2(maskBase, &res_old_1, p_mask, val_0);
         CONFIRM_FAT_TEDDY(r_0, 16, 0, VECTORING, do_confWithBit_teddy);
     }
-    *a->groups = control;
+
     return HWLM_SUCCESS;
 }
 
@@ -763,7 +763,7 @@ hwlm_error_t fdr_exec_teddy_avx2_msks3_fat(const struct FDR *fdr,
                                           p_mask, val_0);
         CONFIRM_FAT_TEDDY(r_0, 16, 0, VECTORING, do_confWithBitMany_teddy);
     }
-    *a->groups = control;
+
     return HWLM_SUCCESS;
 }
 
@@ -824,7 +824,7 @@ hwlm_error_t fdr_exec_teddy_avx2_msks3_pck_fat(const struct FDR *fdr,
                                           p_mask, val_0);
         CONFIRM_FAT_TEDDY(r_0, 16, 0, VECTORING, do_confWithBit_teddy);
     }
-    *a->groups = control;
+
     return HWLM_SUCCESS;
 }
 
@@ -889,7 +889,7 @@ hwlm_error_t fdr_exec_teddy_avx2_msks4_fat(const struct FDR *fdr,
                                           &res_old_3, p_mask, val_0);
         CONFIRM_FAT_TEDDY(r_0, 16, 0, VECTORING, do_confWithBitMany_teddy);
     }
-    *a->groups = control;
+
     return HWLM_SUCCESS;
 }
 
@@ -954,7 +954,7 @@ hwlm_error_t fdr_exec_teddy_avx2_msks4_pck_fat(const struct FDR *fdr,
                                           &res_old_3, p_mask, val_0);
         CONFIRM_FAT_TEDDY(r_0, 16, 0, VECTORING, do_confWithBit_teddy);
     }
-    *a->groups = control;
+
     return HWLM_SUCCESS;
 }
 
@@ -1023,7 +1023,7 @@ hwlm_error_t fdr_exec_teddy_avx2_msks1_fast(const struct FDR *fdr,
                                              p_mask);
         CONFIRM_FAST_TEDDY(res_0, 0, VECTORING, do_confWithBit1_fast_teddy);
     }
-    *a->groups = control;
+
     return HWLM_SUCCESS;
 }
 
@@ -1092,7 +1092,7 @@ hwlm_error_t fdr_exec_teddy_avx2_msks1_pck_fast(const struct FDR *fdr,
                                              p_mask);
         CONFIRM_FAST_TEDDY(res_0, 0, VECTORING, do_confWithBit_fast_teddy);
     }
-    *a->groups = control;
+
     return HWLM_SUCCESS;
 }
 
diff --git a/src/fdr/teddy_runtime_common.h b/src/fdr/teddy_runtime_common.h
index 6ccaeb05..dc65c70a 100644
--- a/src/fdr/teddy_runtime_common.h
+++ b/src/fdr/teddy_runtime_common.h
@@ -52,7 +52,6 @@ extern const u8 ALIGN_DIRECTIVE p_mask_arr[17][32];
 #define CHECK_HWLM_TERMINATE_MATCHING                                       \
 do {                                                                        \
     if (unlikely(control == HWLM_TERMINATE_MATCHING)) {                     \
-        *a->groups = control;                                               \
         return HWLM_TERMINATED;                                             \
     }                                                                       \
 } while (0);