diff --git a/jedi/api/classes.py b/jedi/api/classes.py
index eefaf31a..b97d23df 100644
--- a/jedi/api/classes.py
+++ b/jedi/api/classes.py
@@ -347,7 +347,7 @@ class BaseDefinition(object):
         if self._definition.isinstance(pr.ExprStmt):
             return self._evaluator.eval_statement(self._definition)
         elif self._definition.isinstance(pr.Import):
-            return imports.follow_imports(self._evaluator, [self._definition])
+            return imports.ImportWrapper(self._evaluator, self._name).follow()
         else:
             return [self._definition]
 
diff --git a/jedi/evaluate/imports.py b/jedi/evaluate/imports.py
index b8500f9c..fe482fb9 100644
--- a/jedi/evaluate/imports.py
+++ b/jedi/evaluate/imports.py
@@ -684,10 +684,10 @@ class _Importer(object):
         return names
 
 
-def follow_imports(evaluator, scopes):
+def follow_imports(evaluator, types):
     """
     Here we strip the imports - they don't get resolved necessarily.
-    Really used anymore? Merge with remove_star_imports?
+    TODO Really used anymore? Merge with remove_star_imports?
     """
     result = []
     for s in scopes: