diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrReferenceExpressionImpl.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrReferenceExpressionImpl.java
index d0aff5e205b8..40589065654d 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrReferenceExpressionImpl.java
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrReferenceExpressionImpl.java
@@ -108,10 +108,12 @@ public class GrReferenceExpressionImpl extends GrReferenceElementImpl<GrExpressi
 
     if (!InheritanceUtil.isInheritor(type, CommonClassNames.JAVA_UTIL_MAP)) return false;
 
-    final String canonicalText = type.getCanonicalText();
-    if (canonicalText.startsWith("java.")) return true;
-    if (GroovyCommonClassNames.GROOVY_UTIL_CONFIG_OBJECT.equals(canonicalText)) return false;
-    if (canonicalText.startsWith("groovy.")) return true;
+    final String qname = TypesUtil.getQualifiedName(type);
+    if (qname != null) {
+      if (qname.startsWith("java.")) return true; //so we have jdk map here
+      if (GroovyCommonClassNames.GROOVY_UTIL_CONFIG_OBJECT.equals(qname)) return false;
+      if (qname.startsWith("groovy.")) return true; //we have gdk map here
+    }
 
     return false;
   }
diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/TypesUtil.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/TypesUtil.java
index 59c9f9146c3c..38fcd5795cc3 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/TypesUtil.java
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/TypesUtil.java
@@ -422,7 +422,7 @@ public class TypesUtil {
 
   public static boolean isNumericType(@Nullable PsiType type) {
     if (type instanceof PsiClassType) {
-      return TYPE_TO_RANK.contains(type.getCanonicalText());
+      return TYPE_TO_RANK.contains(getQualifiedName(type));
     }
 
     return type instanceof PsiPrimitiveType && TypeConversionUtil.isNumericType(type);
@@ -547,12 +547,12 @@ public class TypesUtil {
         }
       }
     }
-    else if (GroovyCommonClassNames.GROOVY_LANG_GSTRING.equals(type1.getCanonicalText()) &&
-             CommonClassNames.JAVA_LANG_STRING.equals(type2.getInternalCanonicalText())) {
+    else if (GroovyCommonClassNames.GROOVY_LANG_GSTRING.equals(getQualifiedName(type1)) &&
+             CommonClassNames.JAVA_LANG_STRING.equals(getQualifiedName(type2))) {
       return type2;
     }
-    else if (GroovyCommonClassNames.GROOVY_LANG_GSTRING.equals(type2.getCanonicalText()) &&
-             CommonClassNames.JAVA_LANG_STRING.equals(type1.getInternalCanonicalText())) {
+    else if (GroovyCommonClassNames.GROOVY_LANG_GSTRING.equals(getQualifiedName(type2)) &&
+             CommonClassNames.JAVA_LANG_STRING.equals(getQualifiedName(type1))) {
       return type1;
     }
     return GenericsUtil.getLeastUpperBound(type1, type2, manager);
@@ -628,11 +628,7 @@ public class TypesUtil {
   }
 
   public static boolean isClassType(@Nullable PsiType type, @NotNull String qName) {
-    if (type instanceof PsiClassType) {
-      final PsiClass psiClass = ((PsiClassType)type).resolve();
-      return psiClass != null && qName.equals(psiClass.getQualifiedName());
-    }
-    return false;
+    return qName.equals(getQualifiedName(type));
   }
 
   public static PsiSubstitutor composeSubstitutors(PsiSubstitutor s1, PsiSubstitutor s2) {
@@ -859,4 +855,20 @@ public class TypesUtil {
 
     return GroovyCommonClassNames.GROOVY_LANG_CLOSURE.equals(psiClass.getQualifiedName());
   }
+
+  @Nullable
+  public static String getQualifiedName(@Nullable PsiType type) {
+    if (type instanceof PsiClassType) {
+      PsiClass resolved = ((PsiClassType)type).resolve();
+      if (resolved instanceof PsiAnonymousClass) {
+        return getQualifiedName(((PsiAnonymousClass)resolved).getBaseClassType());
+      }
+      if (resolved != null) {
+        return resolved.getQualifiedName();
+      }
+    }
+
+    return null;
+  }
+
 }
diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/ResolveUtil.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/ResolveUtil.java
index 4e5625d37ac7..7dec4e4c3cae 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/ResolveUtil.java
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/ResolveUtil.java
@@ -374,8 +374,11 @@ public class ResolveUtil {
     else if (base instanceof GrTraitType) {
       key = ((GrTraitType)base).erasure().getCanonicalText();
     }
+    else if (base instanceof PsiClassType) {
+      key = TypesUtil.getQualifiedName(base);
+    }
     else {
-      key = TypeConversionUtil.erasure(base).getCanonicalText();
+      key = base.getCanonicalText();
     }
     Map<String, PsiType> result = cache.get(key);
     if (result == null) {
@@ -388,10 +391,13 @@ public class ResolveUtil {
 
   @NotNull
   private static String rawCanonicalText(@NotNull PsiType type) {
-    final String result = type.getCanonicalText();
-    final int i = result.indexOf('<');
-    if (i > 0) return result.substring(0, i);
-    return result;
+    if (type instanceof PsiClassType) {
+      String qname = TypesUtil.getQualifiedName(type);
+      if (qname != null) {
+        return qname;
+      }
+    }
+    return TypeConversionUtil.erasure(type).getCanonicalText();
   }
 
   public static GroovyPsiElement resolveProperty(GroovyPsiElement place, String name) {
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GrAssignabilityTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GrAssignabilityTest.groovy
index 03ac29a17193..668af1ca2cbf 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GrAssignabilityTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GrAssignabilityTest.groovy
@@ -31,10 +31,12 @@ class GrAssignabilityTest extends GrHighlightingTestBase {
   public void testIncompatibleTypesAssignments() { doTest(); }
 
   public void testDefaultMapConstructorNamedArgs() {
+    addBigDecimal()
     doTest(new GroovyConstructorNamedArgumentsInspection());
   }
 
   public void testDefaultMapConstructorNamedArgsError() {
+    addBigDecimal()
     doTest(new GroovyConstructorNamedArgumentsInspection());
   }
 
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/convertToJava/CodeBlockGenerationTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/convertToJava/CodeBlockGenerationTest.groovy
index f6e52759ee23..07dddce977a7 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/convertToJava/CodeBlockGenerationTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/convertToJava/CodeBlockGenerationTest.groovy
@@ -161,7 +161,10 @@ public final class Matcher {
 
   void testArrayAccess() { doTest() }
 
-  void testCastWithEquality() { doTest() }
+  void testCastWithEquality() {
+    addBigDecimal()
+    doTest()
+  }
 
   void testAsserts() { doTest() }