diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/JavaToJKTreeBuilder.kt b/j2k/newSrc/org/jetbrains/kotlin/j2k/JavaToJKTreeBuilder.kt
index 7f5c37d98da..4ff79b46d30 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/JavaToJKTreeBuilder.kt
+++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/JavaToJKTreeBuilder.kt
@@ -454,7 +454,16 @@ class JavaToJKTreeBuilder(var symbolProvider: JKSymbolProvider) {
                         JKIfElseStatementImpl(with(expressionTreeMapper) { condition.toJK() }, thenBranch.toJK(), elseBranch.toJK())
 
                 is PsiForStatement -> JKJavaForLoopStatementImpl(
-                    initialization.toJK(), with(expressionTreeMapper) { condition.toJK() }, update.toJK(), body.toJK()
+                    initialization.toJK(),
+                    with(expressionTreeMapper) { condition.toJK() },
+                    when (update) {
+                        is PsiExpressionListStatement ->
+                            (update as PsiExpressionListStatement).expressionList.expressions.map {
+                                JKExpressionStatementImpl(with(expressionTreeMapper) { it.toJK() })
+                            }
+                        else -> listOf(update.toJK())
+                    },
+                    body.toJK()
                 )
                 is PsiForeachStatement ->
                     JKForInStatementImpl(
@@ -466,7 +475,6 @@ class JavaToJKTreeBuilder(var symbolProvider: JKSymbolProvider) {
                 is PsiWhileStatement -> JKWhileStatementImpl(with(expressionTreeMapper) { condition.toJK() }, body.toJK())
                 is PsiDoWhileStatement -> JKDoWhileStatementImpl(body.toJK(), with(expressionTreeMapper) { condition.toJK() })
 
-
                 is PsiSwitchStatement -> {
                     val cases = mutableListOf<JKJavaSwitchCase>()
                     for (statement in body?.statements.orEmpty()) {