diff --git a/java/java-tests/testData/psi/classUtil/ManyClasses.java b/java/java-tests/testData/psi/classUtil/ManyClasses.java
new file mode 100644
index 000000000000..461dfb4109cf
--- /dev/null
+++ b/java/java-tests/testData/psi/classUtil/ManyClasses.java
@@ -0,0 +1,47 @@
+import java.lang.Comparable;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.Runnable;
+
+public class ManyClasses {
+  public void foo() {
+    Runnable r = new Runnable() {
+      @Override
+      public void run() {
+        Comparable<Integer> c = new Comparable<Integer>() {
+          @Override
+          public int compareTo(Integer o) {
+            return 0;
+          }
+        };
+      }
+    };
+    
+    class FooLocal {
+      Runnable r = new Runnable() {
+        @Override
+        public void run() {
+        }
+      };
+    }
+  }
+  
+  public void bar() {
+    class FooLocal implements Runnable {
+      @Override
+      public void run() {
+      }
+    }
+  }
+  
+  public class Child {
+    
+  }
+  
+}
+
+class Local {
+  public static class Sub {
+
+  }
+}
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/psi/util/ClassUtilTest.java b/java/java-tests/testSrc/com/intellij/psi/util/ClassUtilTest.java
new file mode 100644
index 000000000000..efac16071d38
--- /dev/null
+++ b/java/java-tests/testSrc/com/intellij/psi/util/ClassUtilTest.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2000-2011 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.
+ */
+package com.intellij.psi.util;
+
+import com.intellij.JavaTestUtil;
+import com.intellij.psi.PsiClass;
+import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
+
+/**
+ * @author yole
+ */
+public class ClassUtilTest extends LightCodeInsightFixtureTestCase {
+  public void testFindPsiClassByJvmName() {
+    myFixture.configureByFile("ManyClasses.java");
+    assertNotNull(ClassUtil.findPsiClassByJVMName(getPsiManager(), "ManyClasses"));
+    assertNotNull(ClassUtil.findPsiClassByJVMName(getPsiManager(), "ManyClasses$1"));
+    assertNotNull(ClassUtil.findPsiClassByJVMName(getPsiManager(), "ManyClasses$1$1"));
+    assertNotNull(ClassUtil.findPsiClassByJVMName(getPsiManager(), "ManyClasses$1FooLocal"));
+    assertNotNull(ClassUtil.findPsiClassByJVMName(getPsiManager(), "ManyClasses$1FooLocal$1"));
+    assertNotNull(ClassUtil.findPsiClassByJVMName(getPsiManager(), "ManyClasses$Child"));
+    assertNotNull(ClassUtil.findPsiClassByJVMName(getPsiManager(), "Local"));
+    assertNotNull(ClassUtil.findPsiClassByJVMName(getPsiManager(), "Local$Sub"));
+
+    final PsiClass fooLocal2 = ClassUtil.findPsiClassByJVMName(getPsiManager(), "ManyClasses$2FooLocal");
+    assertEquals("Runnable", fooLocal2.getImplementsListTypes() [0].getClassName());
+  }
+
+  @Override
+  protected String getBasePath() {
+    return JavaTestUtil.getRelativeJavaTestDataPath() + "/psi/classUtil/";
+  }
+}
diff --git a/java/openapi/src/com/intellij/psi/util/ClassUtil.java b/java/openapi/src/com/intellij/psi/util/ClassUtil.java
index 3926d2d5f976..ec81618addd0 100644
--- a/java/openapi/src/com/intellij/psi/util/ClassUtil.java
+++ b/java/openapi/src/com/intellij/psi/util/ClassUtil.java
@@ -148,7 +148,7 @@ public class ClassUtil {
           super.visitClass(aClass);
           return;
         }
-        if (aClass.getQualifiedName() == null && Comparing.strEqual(name, aClass.getName())) {
+        if (Comparing.strEqual(name, aClass.getName())) {
           myCurrentIdx++;
           if (myCurrentIdx == idx || idx == -1) {
             result[0] = aClass;