diff --git a/.travis.yml b/.travis.yml
index 8fce79f7..4e8f2514 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ install:
     - "pip install -r requirements.txt"
     - "pip install -r $VIRTUAL_ENV/src/xblock-sdk/requirements/base.txt"
     - "pip install -r $VIRTUAL_ENV/src/xblock-sdk/requirements/test.txt"
-    - "pip uninstall -y xblock-problem-builder && python setup.py sdist && pip install dist/xblock-problem-builder-2.0.3.tar.gz"
+    - "pip uninstall -y xblock-problem-builder && python setup.py sdist && pip install dist/xblock-problem-builder-2.0.4.tar.gz"
     - "pip install -r test_requirements.txt"
     - "mkdir var"
 script:
diff --git a/problem_builder/answer.py b/problem_builder/answer.py
index f09016d5..4ccd2ec3 100644
--- a/problem_builder/answer.py
+++ b/problem_builder/answer.py
@@ -164,7 +164,7 @@ def student_input(self):
 
     def mentoring_view(self, context=None):
         """ Render this XBlock within a mentoring block. """
-        context = context or {}
+        context = context.copy() if context else {}
         context['self'] = self
         context['hide_header'] = context.get('hide_header', False) or not self.show_title
         html = loader.render_template('templates/html/answer_editable.html', context)
@@ -266,7 +266,7 @@ def student_input(self):
 
     def mentoring_view(self, context=None):
         """ Render this XBlock within a mentoring block. """
-        context = context or {}
+        context = context.copy() if context else {}
         context['title'] = self.display_name
         context['description'] = self.description
         context['student_input'] = self.student_input
diff --git a/problem_builder/step.py b/problem_builder/step.py
index 1b386d97..2c0ce815 100644
--- a/problem_builder/step.py
+++ b/problem_builder/step.py
@@ -95,12 +95,12 @@ def display_name_with_default(self):
         return self._(u"Question")
 
     def author_view(self, context):
-        context = context or {}
+        context = context.copy() if context else {}
         context['hide_header'] = True
         return self.mentoring_view(context)
 
     def author_preview_view(self, context):
-        context = context or {}
+        context = context.copy() if context else {}
         context['hide_header'] = True
         return self.student_view(context)
 
diff --git a/problem_builder/table.py b/problem_builder/table.py
index d8a18974..bc363a15 100644
--- a/problem_builder/table.py
+++ b/problem_builder/table.py
@@ -70,7 +70,7 @@ class MentoringTableBlock(StudioEditableXBlockMixin, StudioContainerXBlockMixin,
     has_children = True
 
     def student_view(self, context):
-        context = context or {}
+        context = context.copy() if context else {}
         fragment = Fragment()
         header_values = []
         content_values = []
@@ -136,7 +136,7 @@ class MentoringTableColumn(StudioEditableXBlockMixin, StudioContainerXBlockMixin
 
     def mentoring_view(self, context=None):
         """ Render this XBlock within a mentoring block. """
-        context = context or {}
+        context = context.copy() if context else {}
         fragment = Fragment()
         for child_id in self.children:
             child = self.runtime.get_block(child_id)
diff --git a/setup.py b/setup.py
index d649c384..aac303d9 100644
--- a/setup.py
+++ b/setup.py
@@ -75,7 +75,7 @@ def package_data(pkg, root_list):
 
 setup(
     name='xblock-problem-builder',
-    version='2.0.3',
+    version='2.0.4',
     description='XBlock - Problem Builder',
     packages=['problem_builder', 'problem_builder.v1'],
     install_requires=[