diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/LazyJavaSubModule.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/LazyJavaSubModule.kt
index 3a57931aefb..c8ea96e18c1 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/LazyJavaSubModule.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/LazyJavaSubModule.kt
@@ -76,6 +76,9 @@ public open class LazyJavaSubModule(
         }
 
         override fun resolveClassByFqName(fqName: FqName): ClassDescriptor? {
+            val builtinClass = JavaClassResolver.getKotlinBuiltinClassDescriptor(fqName)
+            if (builtinClass != null) return builtinClass
+
             val jClass = c.finder.findClass(fqName)
             if (jClass != null) return resolveClass(jClass)