diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
index c26167ec172..a158b7ced1d 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
@@ -81,7 +81,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
 
     private static final String CLASS_NO_PATTERN_MATCHED_EXCEPTION = "jet/NoPatternMatchedException";
     private static final String CLASS_TYPE_CAST_EXCEPTION = "jet/TypeCastException";
-    public static final Set<DeclarationDescriptor> INTEGRAL_RANGES = KotlinBuiltIns.getInstance().getIntegralRanges();
+    private static final Set<DeclarationDescriptor> INTEGRAL_RANGES = KotlinBuiltIns.getInstance().getIntegralRanges();
 
     private int myLastLineNumber = -1;
 
diff --git a/compiler/testData/codegen/box/primitiveTypes/kt4097.kt b/compiler/testData/codegen/box/primitiveTypes/kt4097.kt
new file mode 100644
index 00000000000..04cc01c3f3a
--- /dev/null
+++ b/compiler/testData/codegen/box/primitiveTypes/kt4097.kt
@@ -0,0 +1,15 @@
+fun box(): String {
+    val shouldBeTrue = 555555555555555555L in 123456789123456789L..987654321987654321L
+    if (!shouldBeTrue) return "Fail 1"
+
+    val shouldBeFalse = 5000000000L in 6000000000L..9000000000L
+    if (shouldBeFalse) return "Fail 2"
+
+    if (123123123123L !in 100100100100L..200200200200L) return "Fail 3"
+
+    return when (9876543210) {
+        in 2000000000L..3333333333L -> "Fail 4"
+        !in 8888888888L..9999999999L -> "Fail 5"
+        else -> "OK"
+    }
+}
diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java
index dc81c5dd5ad..b8e8ad9dd4e 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java
@@ -4257,6 +4257,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             doTest("compiler/testData/codegen/box/primitiveTypes/kt3576.kt");
         }
         
+        @TestMetadata("kt4097.kt")
+        public void testKt4097() throws Exception {
+            doTest("compiler/testData/codegen/box/primitiveTypes/kt4097.kt");
+        }
+        
         @TestMetadata("kt4098.kt")
         public void testKt4098() throws Exception {
             doTest("compiler/testData/codegen/box/primitiveTypes/kt4098.kt");
diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java
index 9fc4e99d8ed..e514029973f 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java
@@ -16,14 +16,17 @@
 
 package org.jetbrains.jet.codegen.generated;
 
+import junit.framework.Assert;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+
+import java.io.File;
+import java.util.regex.Pattern;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
 
-import java.io.File;
-import java.util.regex.Pattern;
+import org.jetbrains.jet.codegen.generated.AbstractBlackBoxCodegenTest;
 
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java b/core/descriptors/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java
index 355ecc75460..39f7516e540 100644
--- a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java
+++ b/core/descriptors/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java
@@ -284,8 +284,7 @@ public class KotlinBuiltIns {
                 getBuiltInClassByName("ByteRange"),
                 getBuiltInClassByName("ShortRange"),
                 getBuiltInClassByName("CharRange"),
-                getBuiltInClassByName("IntRange"),
-                getBuiltInClassByName("LongRange")
+                getBuiltInClassByName("IntRange")
         );
     }