diff --git a/common/lib/capa/capa/responsetypes.py b/common/lib/capa/capa/responsetypes.py
index 1b40742419..6c8af09946 100644
--- a/common/lib/capa/capa/responsetypes.py
+++ b/common/lib/capa/capa/responsetypes.py
@@ -1087,8 +1087,7 @@ def sympy_check2():
         # exec the check function
         if isinstance(self.code, basestring):
             try:
-                raise Exception("exec 1")
-                exec self.code in self.context['global_context'], self.context
+                safe_exec.safe_exec(self.code, self.context)
                 correct = self.context['correct']
                 messages = self.context['messages']
                 overall_message = self.context['overall_message']
diff --git a/common/test/data/embedded_python/course/2013_Spring.xml b/common/test/data/embedded_python/course/2013_Spring.xml
index 15e11befd1..fa6881c37b 100644
--- a/common/test/data/embedded_python/course/2013_Spring.xml
+++ b/common/test/data/embedded_python/course/2013_Spring.xml
@@ -92,6 +92,20 @@ print(num)
   </text>
 </problem>
 
+<problem url_name="computed_answer">
+
+  <customresponse>
+    <textline size="5" correct_answer="Xyzzy"/>
+    <answer type="loncapa/python">
+if submission[0] == "Xyzzy":
+    correct = ['correct']
+else:
+    correct = ['incorrect']
+    </answer>
+  </customresponse>
+
+</problem>
+
     </vertical>
   </chapter>
 </course>
diff --git a/lms/djangoapps/courseware/tests/tests.py b/lms/djangoapps/courseware/tests/tests.py
index ba9799b0df..9d3538d19b 100644
--- a/lms/djangoapps/courseware/tests/tests.py
+++ b/lms/djangoapps/courseware/tests/tests.py
@@ -1023,3 +1023,8 @@ class TestSchematicResponse(TestSubmittingProblems):
         resp = self.submit_question_answer('cfn_problem', {'2_1': "xyzzy!"})
         respdata = json.loads(resp.content)
         self.assertEqual(respdata['success'], 'incorrect')
+
+    def test_computed_answer(self):
+        resp = self.submit_question_answer('computed_answer', {'2_1': "Xyzzy"})
+        respdata = json.loads(resp.content)
+        self.assertEqual(respdata['success'], 'correct')