diff --git a/src/layouts/capability-questions/capability-questions.vue b/src/layouts/capability-questions/capability-questions.vue
index d90c2f777..c916cf99d 100644
--- a/src/layouts/capability-questions/capability-questions.vue
+++ b/src/layouts/capability-questions/capability-questions.vue
@@ -84,7 +84,7 @@ export default {
                 // reset selectedAnswers for this glassPiece
                 this.selectedAnswers[glassPiece.answerKey] = [];
 
-                const updatedGlassPiece = this.setupInitialData(glass, i, alreadyAnsweredQuestions);
+                const updatedGlassPiece = this.setupInitialData(glassPiece, i, alreadyAnsweredQuestions);
 
                 // Set up watch for each set of glass questions
                 this.$watch(
diff --git a/src/layouts/molding-questions/molding-questions.vue b/src/layouts/molding-questions/molding-questions.vue
index d0e85e244..9b0b39d81 100644
--- a/src/layouts/molding-questions/molding-questions.vue
+++ b/src/layouts/molding-questions/molding-questions.vue
@@ -84,7 +84,7 @@ export default {
                 // reset selectedAnswers for this glassPiece
                 this.selectedAnswers[glassPiece.answerKey] = [];
 
-                const updatedGlassPiece = this.setupInitialData(glass, i, alreadyAnsweredQuestions);
+                const updatedGlassPiece = this.setupInitialData(glassPiece, i, alreadyAnsweredQuestions);
 
                 this.$watch(
                     "selectedAnswers." + glassPiece.answerKey,
diff --git a/src/layouts/part-questions/part-questions.vue b/src/layouts/part-questions/part-questions.vue
index 6034986a4..6b1ebb87f 100644
--- a/src/layouts/part-questions/part-questions.vue
+++ b/src/layouts/part-questions/part-questions.vue
@@ -84,7 +84,7 @@ export default {
                 // reset selectedAnswers for this glassPiece
                 this.selectedAnswers[glassPiece.answerKey] = [];
 
-                const updatedGlassPiece = this.setupInitialData(glass, i, alreadyAnsweredQuestions);
+                const updatedGlassPiece = this.setupInitialData(glassPiece, i, alreadyAnsweredQuestions);
 
                 // Set up watch for each set of glass questions
                 this.$watch(