diff --git a/src/common-components/base-input-button/base-input-button.vue b/src/common-components/base-input-button/base-input-button.vue
index 225363401..968259c80 100644
--- a/src/common-components/base-input-button/base-input-button.vue
+++ b/src/common-components/base-input-button/base-input-button.vue
@@ -28,6 +28,7 @@ import { toRef } from "vue";
 import { gaStoreActions } from "../../constants/store-actions";
 import store from "../../store";
 
+// TODO KO Bug: select a chip via radio button, hit continue - doesn't fire the chip number
 export default {
     name: "base-input-button",
     emits: ["change"],
@@ -215,13 +216,13 @@ export default {
                 );
                 
                 if (
-                    firedGaClickEventValues[lastFocusedInputGroup] !=
-                    currentlySelectedValues[lastFocusedInputGroup]
+                    firedGaClickEventValues[this.groupName] !=
+                    currentlySelectedValues[this.groupName]
                 ) {
                     this.pushClickEventToGA(
-                        currentlySelectedValues[lastFocusedInputGroup]
+                        currentlySelectedValues[this.groupName]
                     );
-                }
+                } 
             }
         },
     },