diff --git a/compiler/testData/diagnostics/tests/platformTypes/getParentOfType.kt b/compiler/testData/diagnostics/tests/platformTypes/getParentOfType.kt
new file mode 100644
index 00000000000..298c74ab12a
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/platformTypes/getParentOfType.kt
@@ -0,0 +1,36 @@
+// FILE: p/PsiElement.java
+
+package p;
+
+public interface PsiElement {}
+
+// FILE: p/JetExpression.java
+
+package p;
+
+public interface JetExpression extends PsiElement {}
+
+// FILE: p/Util.java
+
+package p;
+
+public class Util {
+
+    public static <T extends PsiElement> T getParentOfType(@Nullable PsiElement element, @NotNull Class<T> aClass) {
+        return null;
+    }
+
+    public static void on(JetExpression e) {}
+}
+
+// FILE: k.kt
+
+import p.*
+
+fun test(e: JetExpression) {
+    Util.on(
+        Util.getParentOfType(e, javaClass<JetExpression>()) ?: e
+    )
+}
+
+fun <T> javaClass(): Class<T> = null!!
\ No newline at end of file
diff --git a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
index b27bdc320ee..3ab126f7672 100644
--- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
@@ -7717,6 +7717,11 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 doTest(fileName);
             }
             
+            @TestMetadata("getParentOfType.kt")
+            public void testGetParentOfType() throws Exception {
+                doTest("compiler/testData/diagnostics/tests/platformTypes/getParentOfType.kt");
+            }
+            
             @TestMetadata("inference.kt")
             public void testInference() throws Exception {
                 String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/inference.kt");
diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/TypeUtils.java b/core/descriptors/src/org/jetbrains/jet/lang/types/TypeUtils.java
index 57eb82b504c..a0ab218889d 100644
--- a/core/descriptors/src/org/jetbrains/jet/lang/types/TypeUtils.java
+++ b/core/descriptors/src/org/jetbrains/jet/lang/types/TypeUtils.java
@@ -111,6 +111,8 @@ public class TypeUtils {
 
     @NotNull
     public static JetType makeNullableAsSpecified(@NotNull JetType type, boolean nullable) {
+        if (TypesPackage.isFlexible(type)) return type;
+
         // Wrapping serves two purposes here
         // 1. It's requires less memory than copying with a changed nullability flag: a copy has many fields, while a wrapper has only one
         // 2. It preserves laziness of types