diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/TypeMappingConversion.kt b/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/TypeMappingConversion.kt
index 95cb207d4b8..12ea89329a7 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/TypeMappingConversion.kt
+++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/TypeMappingConversion.kt
@@ -56,7 +56,13 @@ class TypeMappingConversion(val context: ConversionContext) : RecursiveApplicabl
     }
 
     private fun JKTypeArgumentList.fixTypeArguments(classSymbol: JKClassSymbol): JKTypeArgumentList {
-        if (typeArguments.isNotEmpty()) return this
+        if (typeArguments.isNotEmpty()) {
+            return JKTypeArgumentListImpl(
+                typeArguments.map { typeArgument ->
+                    JKTypeElementImpl(typeArgument.type.mapType(null))
+                }
+            )
+        }
         val typeParametersCount = classSymbol.expectedTypeParametersCount()
         return when (typeParametersCount) {
             0 -> this