diff --git a/src/layouts/capability-questions/capability-questions.spec.js b/src/layouts/capability-questions/capability-questions.spec.js
index 193b078e..2ddec929 100644
--- a/src/layouts/capability-questions/capability-questions.spec.js
+++ b/src/layouts/capability-questions/capability-questions.spec.js
@@ -277,6 +277,7 @@ describe('capabilityQuestions.vue', () => {
             wrapper.unmount();
         });
 
+        // TODO add test spying on getPartFromCapQuestionAnswer
         test('Should save to pinia store', async () => {
             // Arrange
             const { wrapper } = setupMocks({});
diff --git a/src/layouts/capability-questions/capability-questions.vue b/src/layouts/capability-questions/capability-questions.vue
index f032c18c..c19c5250 100644
--- a/src/layouts/capability-questions/capability-questions.vue
+++ b/src/layouts/capability-questions/capability-questions.vue
@@ -154,9 +154,10 @@ export default {
 
             // set recalibration properties of parts based on capability question answers
             for (let answer of questionAnswersArray) {
-                let partAssociatedWithAnswer = this.partsOrQuestionsData.find((x) => x.glassLocation === answer.glassLocation).parts[0];
-                partAssociatedWithAnswer = await useMainStore().getPartFromCapabilityQuestionAnswer(partAssociatedWithAnswer, answer);
-                console.log(JSON.stringify(partAssociatedWithAnswer));
+                const partData = this.partsOrQuestionsData.find((x) => x.glassLocation === answer.glassLocation);
+                if (partData) {
+                    partData.parts[0] = await useMainStore().getPartFromCapabilityQuestionAnswer(partData.parts[0], answer);
+                }
             }
 
             this.navigateForward(this.partsOrQuestionsData, null);