diff --git a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/dsl/KotlinMapVariable.kt b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/dsl/KotlinMapVariable.kt
index db04ad551af..e21977fc597 100644
--- a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/dsl/KotlinMapVariable.kt
+++ b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/dsl/KotlinMapVariable.kt
@@ -10,7 +10,7 @@ import com.intellij.debugger.streams.trace.impl.handler.type.MapType
  * @author Vitaliy.Bibaev
  */
 class KotlinMapVariable(type: MapType, name: String) : MapVariableBase(type, name) {
-  override fun get(key: Expression): Expression = TextExpression("${toCode()}[${key.toCode()}]")
+  override fun get(key: Expression): Expression = this.call("getValue", key)
 
   override fun set(key: Expression, newValue: Expression): Expression =
     TextExpression("${toCode()}[${key.toCode()}] = ${newValue.toCode()}")
diff --git a/idea/testData/debugger/sequence/dsl/mapConvertToArray.out b/idea/testData/debugger/sequence/dsl/mapConvertToArray.out
index 4c5ce533caa..480fed02b7a 100644
--- a/idea/testData/debugger/sequence/dsl/mapConvertToArray.out
+++ b/idea/testData/debugger/sequence/dsl/mapConvertToArray.out
@@ -6,7 +6,7 @@ run {
   var i: kotlin.Int = 0
   for (key in map.keys) {
     keys[i] = key
-    values[i] = map[key]
+    values[i] = map.getValue(key)
     i++
   }
   resultArray = kotlin.arrayOf<kotlin.Any?>(keys, values)
diff --git a/idea/testData/debugger/sequence/dsl/mapGet.out b/idea/testData/debugger/sequence/dsl/mapGet.out
index 88a45824a18..a4b54e1e72b 100644
--- a/idea/testData/debugger/sequence/dsl/mapGet.out
+++ b/idea/testData/debugger/sequence/dsl/mapGet.out
@@ -1 +1 @@
-map[key]
+map.getValue(key)