diff --git a/idea/testData/debugger/sequence/exec/sequence/outs/windowedWithBigStep.out b/idea/testData/debugger/sequence/exec/sequence/outs/windowedWithBigStep.out
new file mode 100644
index 00000000000..9a74ba16ef4
--- /dev/null
+++ b/idea/testData/debugger/sequence/exec/sequence/outs/windowedWithBigStep.out
@@ -0,0 +1,35 @@
+LineBreakpoint created at WindowedWithBigStep.kt:6
+Run Java
+Connected to the target VM
+WindowedWithBigStep.kt:6
+sequenceOf(1, 1, 1, 1, 1, 1, 1, 1)
+.windowed(3, 5)
+.count()
+windowed
+    before: 1,2,3,5,6,7,8,9
+    after: 4,10
+count
+    before: 4,10
+    after: nothing
+mappings for windowed
+  direct:
+    1 -> 4
+    2 -> 4
+    3 -> 4
+    5 -> nothing
+    6 -> nothing
+    7 -> 10
+    8 -> 10
+    9 -> 10
+  reverse:
+    1,2,3 <- 4
+    7,8,9 <- 10
+mappings for count
+  direct:
+    4 -> nothing
+    10 -> nothing
+  reverse:
+    empty
+Disconnected from the target VM
+
+Process finished with exit code 0
diff --git a/idea/testData/debugger/sequence/exec/sequence/outs/windowedWithStep.out b/idea/testData/debugger/sequence/exec/sequence/outs/windowedWithStep.out
new file mode 100644
index 00000000000..07425a2576d
--- /dev/null
+++ b/idea/testData/debugger/sequence/exec/sequence/outs/windowedWithStep.out
@@ -0,0 +1,38 @@
+LineBreakpoint created at WindowedWithStep.kt:5
+Run Java
+Connected to the target VM
+WindowedWithStep.kt:5
+sequenceOf(1, 1, 1, 1, 1, 1, 1, 1, 1)
+.windowed(4, 2)
+.count()
+windowed
+    before: 1,2,3,4,6,7,9,10,12
+    after: 5,8,11
+count
+    before: 5,8,11
+    after: nothing
+mappings for windowed
+  direct:
+    1 -> 5
+    2 -> 5
+    3 -> 5,8
+    4 -> 5,8
+    6 -> 8,11
+    7 -> 8,11
+    9 -> 11
+    10 -> 11
+    12 -> nothing
+  reverse:
+    1,2,3,4 <- 5
+    3,4,6,7 <- 8
+    6,7,9,10 <- 11
+mappings for count
+  direct:
+    5 -> nothing
+    8 -> nothing
+    11 -> nothing
+  reverse:
+    empty
+Disconnected from the target VM
+
+Process finished with exit code 0
diff --git a/idea/testData/debugger/sequence/exec/sequence/src/misc/WindowedWithBigStep.kt b/idea/testData/debugger/sequence/exec/sequence/src/misc/WindowedWithBigStep.kt
new file mode 100644
index 00000000000..7048d63f2e2
--- /dev/null
+++ b/idea/testData/debugger/sequence/exec/sequence/src/misc/WindowedWithBigStep.kt
@@ -0,0 +1,7 @@
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package misc
+
+fun main(args: Array<String>) {
+  // Breakpoint!
+  sequenceOf(1, 1, 1, 1, 1, 1, 1, 1).windowed(3, 5).count()
+}
\ No newline at end of file
diff --git a/idea/testData/debugger/sequence/exec/sequence/src/misc/WindowedWithStep.kt b/idea/testData/debugger/sequence/exec/sequence/src/misc/WindowedWithStep.kt
new file mode 100644
index 00000000000..d9adc9bb38d
--- /dev/null
+++ b/idea/testData/debugger/sequence/exec/sequence/src/misc/WindowedWithStep.kt
@@ -0,0 +1,6 @@
+package misc
+
+fun main(args: Array<String>) {
+  // Breakpoint!
+  sequenceOf(1, 1, 1, 1, 1, 1, 1, 1, 1).windowed(4, 2).count()
+}
\ No newline at end of file
diff --git a/idea/tests/com/intellij/debugger/streams/kotlin/exec/sequence/MiscOperationsTest.kt b/idea/tests/com/intellij/debugger/streams/kotlin/exec/sequence/MiscOperationsTest.kt
index 7c53c838dc8..39a44ac6990 100644
--- a/idea/tests/com/intellij/debugger/streams/kotlin/exec/sequence/MiscOperationsTest.kt
+++ b/idea/tests/com/intellij/debugger/streams/kotlin/exec/sequence/MiscOperationsTest.kt
@@ -23,4 +23,6 @@ class MiscOperationsTest : OperationsTestCase("misc") {
 
   fun testWindowed() = doTestWithResult()
   fun testWindowedWithPartial() = doTestWithResult()
+  fun testWindowedWithBigStep() = doTestWithResult()
+  fun testWindowedWithStep() = doTestWithResult()
 }
\ No newline at end of file