diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/components/SwitchComponent.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/components/SwitchComponent.js
index 09e7657a55ff13d412b24d014b3beb3be0f25dc8..f9e5c5847e623b1de09d57162470e150ae2764fe 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/components/SwitchComponent.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/components/SwitchComponent.js
@@ -39,8 +39,9 @@ const CustomSwitch = ({ node, getPos }) => {
   const handleChange = () => {
     setChecked(!checked);
 
-    context.view.main.state.doc.descendants((editorNode, index) => {
+    context.view.main.state.doc.descendants((editorNode, pos) => {
       if (editorNode.type.name === 'multiple_choice_single_correct_container') {
+        console.log(editorNode, pos);
         editorNode.content.content.forEach(element => {
           if (element.attrs.id === node.attrs.id) {
             context.view.main.dispatch(
@@ -49,8 +50,18 @@ const CustomSwitch = ({ node, getPos }) => {
                 correct: !checked,
               }),
             );
-          } else {
-            console.log('in else');
+          } else if (element.attrs.correct) {
+            console.log(element);
+            context.view.main.dispatch(
+              context.view.main.state.tr.setNodeMarkup(
+                getPos() + 4,
+                undefined,
+                {
+                  ...element.attrs,
+                  correct: false,
+                },
+              ),
+            );
           }
         });
       }
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/multipleChoiceSingleCorrectContainerNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/multipleChoiceSingleCorrectContainerNode.js
index 2f84777aad7d4541f94307a3acb72a0aad28dd9f..8f6db320254edff86987dfc4864456155f40f838 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/multipleChoiceSingleCorrectContainerNode.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/multipleChoiceSingleCorrectContainerNode.js
@@ -16,7 +16,7 @@ const multipleChoiceSingleCorrectContainerNode = {
         return {
           id: dom.dataset.id,
           class: dom.getAttribute('class'),
-          correctId: dom.getAttribute('singleCorrect'),
+          correctId: dom.getAttribute('correctId'),
         };
       },
     },
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/multipleChoiceSingleCorrectNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/multipleChoiceSingleCorrectNode.js
index 3936d46327ce716b8f358037321a254063fc9640..719d7e99452cc759919b6efa8cc3429bf77cfbc9 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/multipleChoiceSingleCorrectNode.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/multipleChoiceSingleCorrectNode.js
@@ -6,13 +6,11 @@ const multipleChoiceSingleCorrectNode = {
     id: { default: uuidv4() },
     correct: { default: false },
     feedback: { default: '' },
-    singleCorrect: { default: true },
   },
   group: 'block questions',
   content: 'block*',
   defining: true,
 
-  // atom: true,
   parseDOM: [
     {
       tag: 'div.multiple-choice-option-single-correct',
@@ -22,7 +20,6 @@ const multipleChoiceSingleCorrectNode = {
           class: dom.getAttribute('class'),
           correct: JSON.parse(dom.getAttribute('correct').toLowerCase()),
           feedback: dom.getAttribute('feedback'),
-          singleCorrect: dom.getAttribute('singleCorrect'),
         };
       },
     },