diff --git a/jedi/evaluate.py b/jedi/evaluate.py
index b1fb43aa..146e5ee9 100644
--- a/jedi/evaluate.py
+++ b/jedi/evaluate.py
@@ -558,7 +558,6 @@ def follow_call_list(call_list, follow_array=False):
     It is used to evaluate a two dimensional object, that has calls, arrays and
     operators in it.
     """
-    # TODO remove follow_array?!
     def evaluate_list_comprehension(lc, parent=None):
         input = lc.input
         nested_lc = lc.input.token_list[0]
@@ -585,8 +584,12 @@ def follow_call_list(call_list, follow_array=False):
         calls_iterator = iter(call_list)
         for call in calls_iterator:
             if pr.Array.is_type(call, pr.Array.NOARRAY):
-                result += itertools.chain.from_iterable(follow_statement(s)
-                                                        for s in call)
+                r = list(itertools.chain.from_iterable(follow_statement(s)
+                                                       for s in call))
+                call_path = call.generate_call_path()
+                next(call_path, None)  # the first one has been used already
+                result += follow_paths(call_path, r, call.parent,
+                                      position=call.start_pos)
             elif isinstance(call, pr.ListComprehension):
                 loop = evaluate_list_comprehension(call)
                 stmt = copy.copy(call.stmt)
@@ -623,14 +626,6 @@ def follow_call_list(call_list, follow_array=False):
                                         and str(r.name) == 'str']:
                         # if it is an iterable, ignore * operations
                         next(calls_iterator)
-
-    if follow_array and isinstance(call_list, pr.Array):
-        # call_list can also be a two dimensional array
-        call_path = call_list.generate_call_path()
-        next(call_path, None)  # the first one has been used already
-        call_scope = call_list.parent_stmt
-        position = call_list.start_pos
-        result = follow_paths(call_path, result, call_scope, position=position)
     return set(result)
 
 
diff --git a/jedi/parsing_representation.py b/jedi/parsing_representation.py
index da6d8e91..f36bf434 100644
--- a/jedi/parsing_representation.py
+++ b/jedi/parsing_representation.py
@@ -773,17 +773,20 @@ class Statement(Simple):
 
             maybe_dict = array_type == Array.SET
             break_tok = None
+            is_array = None
             while True:
                 stmt, break_tok = parse_array_el(token_iterator, maybe_dict,
                                              break_on_assignment=bool(add_el))
                 if stmt is None:
                     break
                 else:
+                    if break_tok == ',':
+                        is_array = True
                     is_key = maybe_dict and break_tok == ':'
                     arr.add_statement(stmt, is_key)
                     if break_tok in closing_brackets or is_assignment(break_tok):
                         break
-            if arr.type == Array.TUPLE and len(arr) == 1 and break_tok != ',':
+            if arr.type == Array.TUPLE and len(arr) == 1 and not is_array:
                 arr.type = Array.NOARRAY
             if not arr.values and maybe_dict:
                 # this is a really special case - empty brackets {} are
@@ -1088,7 +1091,8 @@ class Array(Call):
                 s += key.get_code(new_line=False) + ': '
             s += stmt.get_code(new_line=False)
             inner.append(s)
-        s = map[self.type] % ', '.join(inner)
+        add = ',' if self.type == self.TUPLE and len(self) == 1 else ''
+        s = map[self.type] % (', '.join(inner) + add)
         return s + super(Array, self).get_code()
 
     def __repr__(self):