diff --git a/jedi/evaluate/__init__.py b/jedi/evaluate/__init__.py
index 57623e68..ee94da34 100644
--- a/jedi/evaluate/__init__.py
+++ b/jedi/evaluate/__init__.py
@@ -122,7 +122,7 @@ class Evaluator(object):
         return f.find(scopes, search_global)
 
     #@memoize_default(default=[], evaluator_is_first_arg=True)
-    @recursion.recursion_decorator
+    #@recursion.recursion_decorator
     @debug.increase_indent
     def eval_statement(self, stmt, seek_name=None):
         """
@@ -149,15 +149,22 @@ class Evaluator(object):
             left = self.find_types(parent, name, stmt.start_pos, search_global=True)
 
             for_stmt = stmt.get_parent_until(tree.ForStmt)
-            if isinstance(for_stmt, tree.ForStmt):
+            if isinstance(for_stmt, tree.ForStmt) and types \
+                    and isinstance(for_stmt.children[1], tree.Name) \
+                    and self.predefined_if_name_dict_dict.get(for_stmt) is None:
                 # Iterate through result and add the values, that's possible
                 # only in for loops without clutter, because they are
-                # predictable.
+                # predictable. Also only do it, if the variable is not a tuple.
                 for_iterable = self.eval_element(for_stmt.children[3])
                 ordered = iterable.ordered_elements_of_iterable(self, for_iterable, types)
+
                 for index_types in ordered:
-                    left = precedence.calculate(self, left, operator, index_types)
+                    dct = {for_stmt.children[1]: index_types}
+                    self.predefined_if_name_dict_dict[for_stmt] = dct
+                    t = self.eval_statement(stmt)
+                    left = precedence.calculate(self, left, operator, t)
                 types = left
+                del self.predefined_if_name_dict_dict[for_stmt]
             else:
                 types = precedence.calculate(self, left, operator, types)
         debug.dbg('eval_statement result %s', types)
diff --git a/jedi/evaluate/finder.py b/jedi/evaluate/finder.py
index c1715850..f7bf2aac 100644
--- a/jedi/evaluate/finder.py
+++ b/jedi/evaluate/finder.py
@@ -161,7 +161,7 @@ class NameFinder(object):
                     scope = scope.parent
                     if isinstance(scope, tree.IsScope) or scope is None:
                         break
-                    elif isinstance(scope, tree.IfStmt):
+                    elif isinstance(scope, (tree.IfStmt, tree.ForStmt)):
                         try:
                             name_dict = self._evaluator.predefined_if_name_dict_dict[scope]
                             types = set(name_dict[str(self.name_str)])