diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index d6de77d5f4..4768f53656 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -105,8 +105,6 @@ class OpenEndedModule():
         else:
             instance_state = {}
 
-        instance_state = self.convert_state_to_current_format(instance_state)
-
         # History is a list of tuples of (answer, score, hint), where hint may be
         # None for any element, and score and hint can be None for the last (current)
         # element.
@@ -122,7 +120,7 @@ class OpenEndedModule():
         # completion (doesn't matter if you self-assessed correct/incorrect).
         self._max_score = int(instance_state.get('max_score', MAX_SCORE))
 
-        oeparam = definition['openendedparam']
+        oeparam = definition['oeparam']
         prompt = definition['prompt']
         rubric = definition['rubric']
 
diff --git a/common/lib/xmodule/xmodule/self_assessment_module.py b/common/lib/xmodule/xmodule/self_assessment_module.py
index 1b10fab9ac..64cf140d38 100644
--- a/common/lib/xmodule/xmodule/self_assessment_module.py
+++ b/common/lib/xmodule/xmodule/self_assessment_module.py
@@ -99,7 +99,9 @@ class SelfAssessmentModule():
         else:
             instance_state = {}
 
-        # History is a list of tuples of (answer, score, feedback), where hint may be
+        instance_state = self.convert_state_to_current_format(instance_state)
+
+        # History is a list of tuples of (answer, score, hint), where hint may be
         # None for any element, and score and hint can be None for the last (current)
         # element.
         # Scores are on scale from 0 to max_score