diff --git a/src/digital-components/question-chain/question-chain.vue b/src/digital-components/question-chain/question-chain.vue
index d72cec9c8..18b123aae 100644
--- a/src/digital-components/question-chain/question-chain.vue
+++ b/src/digital-components/question-chain/question-chain.vue
@@ -8,7 +8,7 @@
                 :questionText="q.questionText"
                 :answers="q.answers"
                 :groupName="`question-${index}-${q.questionSequence}`"
-                :modelValue="q.answerSelected"
+                v-model="q.answerSelected"
                 @update:modelValue="handleAnswer(q, $event)"
                 isRequired
                 :validationRules="validationRules" />
diff --git a/src/fmg-components/layouts/questions-page-layout/questions-page-layout.vue b/src/fmg-components/layouts/questions-page-layout/questions-page-layout.vue
index 156b050c1..e6bf18aae 100644
--- a/src/fmg-components/layouts/questions-page-layout/questions-page-layout.vue
+++ b/src/fmg-components/layouts/questions-page-layout/questions-page-layout.vue
@@ -75,13 +75,8 @@ export default {
         index: Number,
     },
     computed: {
-        selectedAnswers: {
-            get() {
-                return this.modelValue;
-            },
-            set(newValue) {
-                this.$emit("update:modelValue", newValue);
-            },
+        selectedAnswers() {
+            return this.modelValue;
         },
     },
     methods: {
diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js
index 43c55e8cf..d79e4f5b3 100644
--- a/src/mixins/vehicle-questions-mixin.js
+++ b/src/mixins/vehicle-questions-mixin.js
@@ -341,10 +341,10 @@ export default {
             };
 
             // this part has been fully answered, so advance to next part's question chain
-            for (let i = answer.index + 1; i < this.questionsData.length; i++) {
+            for (let i = answer.index + 1; i < self.questionsData.length; i++) {
                 // if this part has not yet been fully answered, then make it the current part
-                if (!this.questionsData[i].answerData?.answerResult) {
-                    this.currentGlassIndex = i;
+                if (!self.questionsData[i].answerData?.answerResult) {
+                    self.currentGlassIndex = i;
                     break;
                 }
             }