--- a/Tools__MethodList.st	Wed Sep 18 07:52:49 2019 +0200
+++ b/Tools__MethodList.st	Wed Sep 18 08:54:16 2019 +0200
@@ -955,7 +955,7 @@
 !
 
 update:something with:aParameter from:changedObject
-    |cls clsName sel mthd mustFlushInheritanceInfo|
+    |cls clsName sel mthd mustFlushInheritanceInfo original|
 
     mustFlushInheritanceInfo := true.
 
@@ -1000,17 +1000,16 @@
         ].
 
         (something == #methodTrap
-        or:[ something == #methodPrivacy
-        or:[ something == #lastTestRunResult] ]) ifTrue:[
+          or:[ something == #methodPrivacy
+          or:[ something == #lastTestRunResult] ]
+        ) ifTrue:[
             cls := aParameter at:1.
             (classes includesIdentical:cls) ifFalse:[ ^ self].
 
             sel := aParameter at:2.
             mthd := cls compiledMethodAt:sel.
-            (mthd notNil and:[mthd isWrapped or:[mthd isMethodWithBreakpoints]]) ifTrue:[
-                |original|
-
-                original := mthd originalMethod.
+            mthd notNil ifTrue:[
+                original := mthd originalMethodIfWrapped.
                 (methodList includesIdentical:original) ifTrue:[
                     methodList replaceAll:original with:mthd.
                     lastSelectedMethods notNil ifTrue:[
@@ -1441,9 +1440,9 @@
         sortByClass := doShowClass and:[ sortBy value == #class ].
         self sortEntries:entries showingClass:doShowClass.
     ].
+
     methods := OrderedCollection new:(entries size).
     methodNameList := OrderedCollection new:(entries size).
-
     newNameList := OrderedCollection new:(entries size).
 
     "/ multiple classes must add the className for some
@@ -1474,7 +1473,6 @@
                 suppressInheritanceInfo:suppressInheritanceInfoNow.
 
         newNameList add:s.
-
         methods add:mthd.
         methodNameList add:{ cls name . sel}.
     ].