diff --git a/jedi/inference/context.py b/jedi/inference/context.py
index e0231ef2..ce4bdf7a 100644
--- a/jedi/inference/context.py
+++ b/jedi/inference/context.py
@@ -337,6 +337,9 @@ class NamespaceContext(TreeContextMixin, ValueContext):
     def get_filters(self, until_position=None, origin_scope=None):
         return self._value.get_filters()
 
+    def get_value(self):
+        return self._value
+
     def py__file__(self):
         return self._value.py__file__()
 
diff --git a/jedi/inference/imports.py b/jedi/inference/imports.py
index 35bbf313..5f19f945 100644
--- a/jedi/inference/imports.py
+++ b/jedi/inference/imports.py
@@ -327,7 +327,7 @@ class Importer(object):
             if in_module is None:
                 n = ImportName(self._module_context, name)
             else:
-                n = SubModuleName(in_module, name)
+                n = SubModuleName(in_module.as_context(), name)
             names.append(n)
         return names
 
diff --git a/jedi/inference/value/module.py b/jedi/inference/value/module.py
index 874dc05d..a7830273 100644
--- a/jedi/inference/value/module.py
+++ b/jedi/inference/value/module.py
@@ -87,7 +87,7 @@ class SubModuleDictMixin(object):
             mods = iter_module_names(self.inference_state, self.py__path__())
             for name in mods:
                 # It's obviously a relative import to the current module.
-                names[name] = SubModuleName(self, name)
+                names[name] = SubModuleName(self.as_context(), name)
 
         # In the case of an import like `from x.` we don't need to
         # add all the variables, this is only about submodules.