diff --git a/jps/jps-builders-6/src/org/jetbrains/jps/javac/ast/api/JavacRef.java b/jps/jps-builders-6/src/org/jetbrains/jps/javac/ast/api/JavacRef.java
index 0032020f7127..55e20d3cfcef 100644
--- a/jps/jps-builders-6/src/org/jetbrains/jps/javac/ast/api/JavacRef.java
+++ b/jps/jps-builders-6/src/org/jetbrains/jps/javac/ast/api/JavacRef.java
@@ -158,7 +158,6 @@ public interface JavacRef {
         }
       }
       if (element instanceof TypeElement) {
-        if (qualifier == null && !checkEnclosingElement(element)) return null;
         return new JavacElementClassImpl(element, qualifier, nameTableCache);
       }
       else if (element instanceof VariableElement) {
@@ -166,6 +165,7 @@ public interface JavacRef {
         return new JavacElementFieldImpl(element, qualifier, nameTableCache);
       }
       else if (element instanceof ExecutableElement) {
+        if (qualifier == null && !checkEnclosingElement(element)) return null;
         return new JavacElementMethodImpl(element, qualifier, nameTableCache);
       }
       else if (element == null || element.getKind() == ElementKind.OTHER || element.getKind() == ElementKind.TYPE_PARAMETER) {