diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/TypeMappingMode.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/TypeMappingMode.kt
index 202a6dddba1..9a1a8ee2ef9 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/TypeMappingMode.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/TypeMappingMode.kt
@@ -26,7 +26,8 @@ internal class TypeMappingMode private constructor(
         val skipDeclarationSiteWildcards: Boolean = false,
         val skipDeclarationSiteWildcardsIfPossible: Boolean = false,
         private val genericArgumentMode: TypeMappingMode? = null,
-        private val genericContravariantArgumentMode: TypeMappingMode? = genericArgumentMode
+        private val genericContravariantArgumentMode: TypeMappingMode? = genericArgumentMode,
+        private val genericInvariantArgumentMode: TypeMappingMode? = genericArgumentMode
 ) {
     companion object {
         /**
@@ -86,11 +87,18 @@ internal class TypeMappingMode private constructor(
                 else
                     null
 
+            val invariantArgumentMode =
+                    if (canBeUsedInSupertypePosition)
+                        getOptimalModeForSignaturePart(type, isForAnnotationParameter, canBeUsedInSupertypePosition = false)
+                    else
+                        null
+
             return TypeMappingMode(
                     isForAnnotationParameter = isForAnnotationParameter,
                     skipDeclarationSiteWildcards = !canBeUsedInSupertypePosition,
                     skipDeclarationSiteWildcardsIfPossible = true,
-                    genericContravariantArgumentMode = contravariantArgumentMode)
+                    genericContravariantArgumentMode = contravariantArgumentMode,
+                    genericInvariantArgumentMode = invariantArgumentMode)
         }
 
         @JvmStatic
@@ -107,6 +115,7 @@ internal class TypeMappingMode private constructor(
     fun toGenericArgumentMode(effectiveVariance: Variance): TypeMappingMode =
             when (effectiveVariance) {
                 Variance.IN_VARIANCE -> genericContravariantArgumentMode ?: this
+                Variance.INVARIANT   -> genericInvariantArgumentMode ?: this
                 else -> genericArgumentMode ?: this
             }
 }
diff --git a/compiler/testData/codegen/boxWithJava/invariantArgumentsNoWildcard/JavaClass.java b/compiler/testData/codegen/boxWithJava/invariantArgumentsNoWildcard/JavaClass.java
new file mode 100644
index 00000000000..8a74860ebce
--- /dev/null
+++ b/compiler/testData/codegen/boxWithJava/invariantArgumentsNoWildcard/JavaClass.java
@@ -0,0 +1,5 @@
+public class JavaClass {
+    public static String test() {
+        return MainKt.bar(MainKt.foo());
+    }
+}
diff --git a/compiler/testData/codegen/boxWithJava/invariantArgumentsNoWildcard/main.kt b/compiler/testData/codegen/boxWithJava/invariantArgumentsNoWildcard/main.kt
new file mode 100644
index 00000000000..5b49da06360
--- /dev/null
+++ b/compiler/testData/codegen/boxWithJava/invariantArgumentsNoWildcard/main.kt
@@ -0,0 +1,11 @@
+class Pair<out X, out Y>(val x: X, val y: Y)
+
+class Inv<T>(val x: T)
+
+fun foo(): Inv<Pair<CharSequence, CharSequence>> = Inv(Pair("O", "K"))
+
+fun bar(inv: Inv<Pair<CharSequence, CharSequence>>) = inv.x.x.toString() + inv.x.y
+
+fun box(): String {
+    return JavaClass.test();
+}
diff --git a/compiler/testData/writeSignature/declarationSiteVariance/wildcardOptimization/arrays.kt b/compiler/testData/writeSignature/declarationSiteVariance/wildcardOptimization/arrays.kt
index 56d05c125da..3ce2d3188dd 100644
--- a/compiler/testData/writeSignature/declarationSiteVariance/wildcardOptimization/arrays.kt
+++ b/compiler/testData/writeSignature/declarationSiteVariance/wildcardOptimization/arrays.kt
@@ -8,7 +8,7 @@ open class Open
 
 fun arrayOfOutOpen(x: Array<Out<Open>>) {}
 // method: ArraysKt::arrayOfOutOpen
-// generic signature: ([LOut<+LOpen;>;)V
+// generic signature: ([LOut<LOpen;>;)V
 
 fun arrayOfOutFinal(x: Array<Out<Final>>) {}
 // method: ArraysKt::arrayOfOutFinal
diff --git a/compiler/testData/writeSignature/declarationSiteVariance/wildcardOptimization/finalReturnType.kt b/compiler/testData/writeSignature/declarationSiteVariance/wildcardOptimization/finalReturnType.kt
index 60ce5ef71f3..b2b66903eee 100644
--- a/compiler/testData/writeSignature/declarationSiteVariance/wildcardOptimization/finalReturnType.kt
+++ b/compiler/testData/writeSignature/declarationSiteVariance/wildcardOptimization/finalReturnType.kt
@@ -10,6 +10,10 @@ fun skipAllOutInvWildcards(): Inv<OutPair<Open, Out<Out<Open>>>> = null!!
 // method: FinalReturnTypeKt::skipAllOutInvWildcards
 // generic signature: ()LInv<LOutPair<LOpen;LOut<LOut<LOpen;>;>;>;>;
 
+fun skipAllInvWildcards(): Inv<In<Out<Open>>> = null!!
+// method: FinalReturnTypeKt::skipAllInvWildcards
+// generic signature: ()LInv<LIn<LOut<+LOpen;>;>;>;
+
 fun notDeepIn(): In<Final> = null!!
 // method: FinalReturnTypeKt::notDeepIn
 // generic signature: ()LIn<LFinal;>;
diff --git a/compiler/testData/writeSignature/declarationSiteVariance/wildcardOptimization/topLevelInv.kt b/compiler/testData/writeSignature/declarationSiteVariance/wildcardOptimization/topLevelInv.kt
index b83b6b94188..fee1e10eb6b 100644
--- a/compiler/testData/writeSignature/declarationSiteVariance/wildcardOptimization/topLevelInv.kt
+++ b/compiler/testData/writeSignature/declarationSiteVariance/wildcardOptimization/topLevelInv.kt
@@ -1,4 +1,5 @@
 class Inv<X>
+class In<in E>
 class Out<out T>
 class Final
 open class Open
@@ -13,12 +14,20 @@ fun invFinal(x: Inv<Final>) {}
 
 fun invOutOpen(x: Inv<Out<Open>>) {}
 // method: TopLevelInvKt::invOutOpen
-// generic signature: (LInv<LOut<+LOpen;>;>;)V
+// generic signature: (LInv<LOut<LOpen;>;>;)V
 
 fun invOutFinal(x: Inv<Out<Final>>) {}
 // method: TopLevelInvKt::invOutFinal
 // generic signature: (LInv<LOut<LFinal;>;>;)V
 
+fun invInOutOpen(x: Inv<In<Out<Open>>>) {}
+// method: TopLevelInvKt::invInOutOpen
+// generic signature: (LInv<LIn<LOut<+LOpen;>;>;>;)V
+
+fun invInOutFinal(x: Inv<In<Out<Final>>>) {}
+// method: TopLevelInvKt::invInOutFinal
+// generic signature: (LInv<LIn<LOut<LFinal;>;>;>;)V
+
 fun invOutProjectedOutFinal(x: Inv<out Out<Final>>) {}
 // method: TopLevelInvKt::invOutProjectedOutFinal
 // generic signature: (LInv<+LOut<LFinal;>;>;)V
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java
index 8cceb623974..4c2949b6bbd 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java
@@ -107,6 +107,12 @@ public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodege
         doTestWithJava(fileName);
     }
 
+    @TestMetadata("invariantArgumentsNoWildcard")
+    public void testInvariantArgumentsNoWildcard() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/invariantArgumentsNoWildcard/");
+        doTestWithJava(fileName);
+    }
+
     @TestMetadata("jvmName")
     public void testJvmName() throws Exception {
         String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/jvmName/");