diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyCodeFragmentFactory.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyCodeFragmentFactory.java
index 834a565fa142..9fbdb4671555 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyCodeFragmentFactory.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyCodeFragmentFactory.java
@@ -233,9 +233,8 @@ public class GroovyCodeFragmentFactory implements CodeFragmentFactory {
       }
 
       public void visitCodeReferenceElement(GrCodeReferenceElement refElement) {
-        if (refElement.getQualifier() != null) {
-          super.visitCodeReferenceElement(refElement);
-        } else {
+        super.visitCodeReferenceElement(refElement);
+        if (refElement.getQualifier() == null) {
           PsiElement resolved = refElement.resolve();
           if (resolved instanceof PsiClass) {
             String qName = ((PsiClass)resolved).getQualifiedName();
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyDebuggerTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyDebuggerTest.groovy
index 094be1d8d787..70c3fe54faa6 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyDebuggerTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyDebuggerTest.groovy
@@ -286,7 +286,7 @@ new Runnable() {
     return result
   }
 
-  private String eval(final String codeText, String expected) throws EvaluateException {
+  private void eval(final String codeText, String expected) throws EvaluateException {
 
     Semaphore semaphore = new Semaphore()
     semaphore.down()