diff --git a/jedi/evaluate/finder.py b/jedi/evaluate/finder.py
index adfaba04..8bafe44f 100644
--- a/jedi/evaluate/finder.py
+++ b/jedi/evaluate/finder.py
@@ -69,24 +69,29 @@ class NameFinder(object):
                 # reference.
                 name_list = sorted(name_list, key=lambda n: n.start_pos, reverse=True)
             for name in name_list:
+                if self.name_str != name.get_code():
+                    continue
+
                 parpar = name.parent.parent
-                if self.name_str == name.get_code() and parpar not in break_scopes:
-                    if not self._name_is_array_assignment(name):
-                        result.append(name)  # `arr[1] =` is not the definition
-                    # for comparison we need the raw class
-                    # this means that a definition was found and is not e.g.
-                    # in if/else.
-                    if result and self._name_is_break_scope(name):
-                        #print result, name.parent, parpar, s
-                        if isinstance(parpar, pr.Flow) \
-                                or isinstance(parpar, pr.KeywordStatement) \
-                                and parpar.name == 'global':
-                            s = nscope.base if isinstance(nscope, er.Class) else nscope
-                            if parpar == s:
-                                break
-                        else:
+                if name.parent.parent in break_scopes:
+                    continue
+
+                if not self._name_is_array_assignment(name):
+                    result.append(name)  # `arr[1] =` is not the definition
+                # for comparison we need the raw class
+                # this means that a definition was found and is not e.g.
+                # in if/else.
+                if result and self._name_is_break_scope(name):
+                    #print result, name.parent, parpar, s
+                    if isinstance(parpar, pr.Flow) \
+                            or isinstance(parpar, pr.KeywordStatement) \
+                            and parpar.name == 'global':
+                        s = nscope.base if isinstance(nscope, er.Class) else nscope
+                        if parpar == s:
                             break
-                        break_scopes.append(parpar)
+                    else:
+                        break
+                    break_scopes.append(parpar)
             if result:
                 break
 
diff --git a/jedi/parser/representation.py b/jedi/parser/representation.py
index bff24513..42103727 100644
--- a/jedi/parser/representation.py
+++ b/jedi/parser/representation.py
@@ -1387,6 +1387,9 @@ class NamePart(object):
     def __eq__(self, other):
         return self.string == other
 
+    def __ne__(self, other):
+        return not self.__eq__(other)
+
     def __hash__(self):
         return hash(self.string)