--- a/DebugView.st	Sun May 27 11:39:22 2018 +0200
+++ b/DebugView.st	Sun May 27 15:04:02 2018 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 1989 by Claus Gittinger
               All Rights Reserved
@@ -3785,7 +3787,8 @@
 
     stepInButton name:'stepInButton'.
 
-    "Created: / 17.11.2001 / 21:00:13 / cg"
+    "Created: / 17-11-2001 / 21:00:13 / cg"
+    "Modified: / 27-05-2018 / 11:40:18 / Claus Gittinger"
 !
 
 initializeTerminateButtonIn:bpanel
@@ -5786,11 +5789,22 @@
 !
 
 doStepIn
-    "skip for next send in selected method"
-
-    self doStepIn:-1
-
-    "Modified: 7.3.1997 / 18:46:49 / cg"
+    "step into the just called method;
+     same as selecting one above the current selected context
+     and then doing a step"
+
+    |con idx|
+
+    con := selectedContext.
+    idx := contextArray identityIndexOf:con.
+    (idx <= 1) ifTrue:[
+        self doSend.
+    ].    
+    self selectContextWithIndex:idx-1.
+    self doStep
+
+    "Modified: / 07-03-1997 / 18:46:49 / cg"
+    "Modified: / 27-05-2018 / 11:46:19 / Claus Gittinger"
 !
 
 doStepIn:lineNrOrNilOrMinus1
@@ -7740,7 +7754,7 @@
                 ]
             ].
 
-            s := Text streamContents:[:s | aContext printWithSeparator:' » ' on:s ].
+            s := Text streamContents:[:s | aContext printWithSeparator:' » ' on:s ].
             RememberedCallChain notNil ifTrue:[
                 (RememberedCallChain includesIdentical:aContext) ifTrue:[
                     s := s withColor:#red.
@@ -9836,7 +9850,7 @@
 
 printConditionOn:aStream
     ignoredSendingClassAndSelectors notEmptyOrNil ifTrue:[
-        aStream nextPutAll:(' if called from %1 » %2'
+        aStream nextPutAll:(' if called from %1 » %2'
                                 bindWith:ignoredSendingClassAndSelectors first first
                                 with:ignoredSendingClassAndSelectors first second).
         ^ self.