diff --git a/idea/testData/debugger/tinyApp/src/stepping/custom/funLiteral.kt b/idea/testData/debugger/tinyApp/src/stepping/custom/funLiteral.kt
index b7437ad833b..56cc68b1380 100644
--- a/idea/testData/debugger/tinyApp/src/stepping/custom/funLiteral.kt
+++ b/idea/testData/debugger/tinyApp/src/stepping/custom/funLiteral.kt
@@ -10,4 +10,4 @@ fun main(args: Array<String>) {
 fun f1(f: () -> Unit) { f() }
 fun f2() {}
 
-// SMART_STEP_INTO_BY_INDEX: 1
\ No newline at end of file
+// SMART_STEP_INTO_BY_INDEX: 2
\ No newline at end of file
diff --git a/idea/testData/debugger/tinyApp/src/stepping/custom/severalFunLiterals.kt b/idea/testData/debugger/tinyApp/src/stepping/custom/severalFunLiterals.kt
index 7575c69854d..b12cfc1b7a3 100644
--- a/idea/testData/debugger/tinyApp/src/stepping/custom/severalFunLiterals.kt
+++ b/idea/testData/debugger/tinyApp/src/stepping/custom/severalFunLiterals.kt
@@ -22,4 +22,4 @@ class MyClass {
 
 fun test() {}
 
-// SMART_STEP_INTO_BY_INDEX: 3
\ No newline at end of file
+// SMART_STEP_INTO_BY_INDEX: 4
\ No newline at end of file
diff --git a/idea/testData/debugger/tinyApp/src/stepping/custom/severalFunLiteralsInClass.kt b/idea/testData/debugger/tinyApp/src/stepping/custom/severalFunLiteralsInClass.kt
index ac62e5c0961..aa4aa2f7fd9 100644
--- a/idea/testData/debugger/tinyApp/src/stepping/custom/severalFunLiteralsInClass.kt
+++ b/idea/testData/debugger/tinyApp/src/stepping/custom/severalFunLiteralsInClass.kt
@@ -25,4 +25,4 @@ class MyClass {
 
 fun test() {}
 
-// SMART_STEP_INTO_BY_INDEX: 3
\ No newline at end of file
+// SMART_STEP_INTO_BY_INDEX: 4
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestBase.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestBase.kt
index bcb14b7dd0a..e77f7622b80 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestBase.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestBase.kt
@@ -183,7 +183,7 @@ abstract class KotlinDebuggerTestBase : KotlinDebuggerTestCase() {
             }
         }
         else {
-            dp.getManagerThread()!!.schedule(dp.createStepIntoCommand(this, ignoreFilters, filters.get(chooseFromList)))
+            dp.getManagerThread()!!.schedule(dp.createStepIntoCommand(this, ignoreFilters, filters.get(chooseFromList - 1)))
         }
     }