diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
index b42520a4f32..fdc2031765c 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
+++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
@@ -153,9 +153,10 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
                                 @Nullable
                                 @Override
                                 public JavaClass findClass(@NotNull FqName fqName) {
-                                    // Do not look for JavaClasses for Kotlin binaries
+                                    // Do not look for JavaClasses for Kotlin binaries & built-ins
                                     if (kotlinClassesFromBinaries.invoke(fqName) != null
-                                        || kotlinNamespacesFromBinaries.invoke(fqName) != null) {
+                                        || kotlinNamespacesFromBinaries.invoke(fqName) != null
+                                        || JavaClassResolver.getKotlinBuiltinClassDescriptor(fqName) != null) {
                                         return null;
                                     }