diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManager.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManager.kt
index 23d97ed528e..d5a5f1ab09d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManager.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManager.kt
@@ -284,8 +284,11 @@ class KotlinPositionManager(private val myDebugProcess: DebugProcess) : MultiReq
         }
 
         val classNames = DebuggerClassNameProvider(myDebugProcess, scopes).getOuterClassNamesForPosition(position)
-        return classNames.mapNotNull { name ->
-            myDebugProcess.requestsManager.createClassPrepareRequest(requestor, name + "*")
+        return classNames.flatMap { name ->
+            listOfNotNull(
+                    myDebugProcess.requestsManager.createClassPrepareRequest(requestor, name),
+                    myDebugProcess.requestsManager.createClassPrepareRequest(requestor, "$name$*")
+            )
         }
     }