diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/MethodSignatureEquality.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/MethodSignatureEquality.java
new file mode 100644
index 000000000000..78333b113ec6
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/MethodSignatureEquality.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2000-2010 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import java.io.*;
+class Test {
+  interface InterfA {
+    <error descr="'foo(T)' is already defined in 'Test.InterfA'"><T extends Cloneable & Iterable> void foo(T x)</error>;
+
+    <error descr="'foo(T)' is already defined in 'Test.InterfA'"><T extends Iterable & Cloneable> void foo(T x)</error>;
+  }
+
+  abstract class A<T extends Throwable> {
+    abstract <T extends Comparable<?> & Serializable> void foo(T x, A<?> y);
+
+    abstract <T extends Serializable & Comparable<?>> void foo(T x, A<? extends Cloneable> y);
+  }
+
+ /* abstract class B<T extends Throwable> {
+    abstract <T extends Comparable<?> & Serializable> void foo(T x, B<?> y);
+
+    abstract <T extends Serializable & Comparable<?>> void foo(T x, B<? extends Throwable> y);
+  }
+
+
+  abstract class C<T extends Throwable & Serializable> {
+    abstract <T extends Comparable<?> & Serializable> void foo(T x, C<? extends Serializable> y);
+
+    abstract <T extends Serializable & Comparable<?>> void foo(T x, C<? extends Throwable> y);
+  }*/
+
+  abstract class D<T extends Throwable & Runnable> {
+    <error descr="'foo(T, D<? extends Runnable>)' clashes with 'foo(T, D<? extends Throwable>)'; both methods have same erasure">abstract <T extends Serializable & Comparable<?>> void foo(T x, D<? extends Runnable> y)</error>;
+
+    abstract <T extends Serializable & Comparable<?>> void foo(T x, D<? extends Throwable> y);
+  }
+
+
+  interface IA {}
+  interface IB {}
+  void testExtendsOrder() {
+    class E<T extends IA & IB> {
+      <error descr="'foo(E<? extends IA>)' clashes with 'foo(E<? extends IB>)'; both methods have same erasure">void foo(E<? extends IA> x)</error> {}
+      void foo(E<? extends IB> x) {}
+    }
+  }
+
+  abstract class F<T extends Throwable> {
+    <error descr="'foo(F<?>)' clashes with 'foo(F<? extends Throwable>)'; both methods have same erasure">abstract void foo(F<?> y)</error>;
+
+    abstract void foo(F<? extends Throwable> y);
+  }
+}
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java
index 2b091ef594a1..96ef628df38b 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java
@@ -98,6 +98,7 @@ public class GenericsHighlightingTest extends LightDaemonAnalyzerTestCase {
   public void testSuperMethodCallWithErasure() throws Exception { doTest(false); }
   public void testWildcardCastConversion() throws Exception { doTest(false); }
   public void testTypeWithinItsWildcardBound() throws Exception { doTest(false); }
+  public void testMethodSignatureEquality() throws Exception { doTest(false); }
 
   public void testJavaUtilCollections() throws Exception {
     PsiClass collectionsClass = getJavaFacade().findClass("java.util.Collections", GlobalSearchScope.moduleWithLibrariesScope(getModule()));
diff --git a/java/openapi/src/com/intellij/psi/util/MethodSignatureUtil.java b/java/openapi/src/com/intellij/psi/util/MethodSignatureUtil.java
index a8cc1102dfcf..73318fb601a5 100644
--- a/java/openapi/src/com/intellij/psi/util/MethodSignatureUtil.java
+++ b/java/openapi/src/com/intellij/psi/util/MethodSignatureUtil.java
@@ -23,6 +23,7 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
@@ -226,14 +227,16 @@ public class MethodSignatureUtil {
     for (int i = 0; i < methoTypeParameters.length; i++) {
       PsiTypeParameter methoTypeParameter = methoTypeParameters[i];
       PsiTypeParameter superTypeParameter = superTypeParameters[i];
-      final PsiClassType[] methoSupers = methoTypeParameter.getSuperTypes();
-      final PsiClassType[] superSupers = superTypeParameter.getSuperTypes();
-      if (methoSupers.length != superSupers.length) return null;
-      for (int j = 0; j < methoSupers.length; j++) {
-        PsiType type1 = methodSubstitutor.substitute(methoSupers[j]);
-        PsiType type2 = methodSubstitutor.substitute(PsiUtil.captureToplevelWildcards(result.substitute(superSupers[j]), methoTypeParameter));
-        if (!type1.equals(type2)) return null;
+      final Set<PsiType> methoSupers = new HashSet<PsiType>();
+      for (PsiClassType methoSuper : methoTypeParameter.getSuperTypes()) {
+        methoSupers.add(methodSubstitutor.substitute(methoSuper));
       }
+
+      final Set<PsiType> superSupers = new HashSet<PsiType>();
+      for (PsiClassType superSuper : superTypeParameter.getSuperTypes()) {
+        superSupers.add(methodSubstitutor.substitute(PsiUtil.captureToplevelWildcards(result.substitute(superSuper), methoTypeParameter)));
+      }
+      if (!methoSupers.equals(superSupers)) return null;
     }
     return result;
   }