--- a/Tools__BreakpointService.st	Tue Feb 24 00:48:06 2015 +0100
+++ b/Tools__BreakpointService.st	Tue Feb 24 09:25:36 2015 +0100
@@ -258,13 +258,11 @@
 
     "/ Transcript show:'update breakpoints for method: '; showCR:aMethod.
     aMethod notNil ifTrue:[
-        aMethod literalsDo:[:eachLiteral |
-            (eachLiteral isKindOf:Breakpoint) ifTrue:[
-                methodsBreakPoints isNil ifTrue:[
-                    methodsBreakPoints := OrderedCollection new.
-                ].
-                methodsBreakPoints add:eachLiteral copy.
+        aMethod breakpointsDo:[:eachLiteral |
+            methodsBreakPoints isNil ifTrue:[
+                methodsBreakPoints := OrderedCollection new.
             ].
+            methodsBreakPoints add:eachLiteral copy.
         ].
         currentMethodClass := aMethod mclass.
     ] ifFalse:[
@@ -283,7 +281,7 @@
 
     "Created: / 06-07-2011 / 15:24:09 / cg"
     "Modified: / 06-07-2011 / 17:32:54 / jv"
-    "Modified: / 05-06-2014 / 14:45:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 23-02-2015 / 14:48:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 updateCurrentMethod
@@ -557,13 +555,8 @@
                     ].
                 ].
 
-                breakpoints := breakpoints
-                                select:[:bp |
-"/                                    bp isReached ifFalse:[ 
-"/                                        "/ Transcript show:'remove unreached:'; showCR:bp 
-"/                                    ].
-                                    bp isReached
-                                ].
+                breakpoints := breakpoints species new.
+                newMethod breakpointsDo:[ :each | breakpoints add: each ].
 
                 "/ must update breakpoints BEFORE the following, because it leads to a change
                 "/ notification, which may clear the breakpoints collection!!
@@ -581,7 +574,7 @@
 
     "Created: / 05-07-2011 / 21:33:13 / cg"
     "Modified: / 22-07-2013 / 16:00:13 / cg"
-    "Modified: / 08-05-2014 / 14:03:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 23-02-2015 / 14:49:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !BreakpointService methodsFor:'queries'!
@@ -703,14 +696,14 @@
 !BreakpointService class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__BreakpointService.st,v 1.59 2015-02-16 12:08:50 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__BreakpointService.st,v 1.60 2015-02-24 08:25:36 vrany Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__BreakpointService.st,v 1.59 2015-02-16 12:08:50 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__BreakpointService.st,v 1.60 2015-02-24 08:25:36 vrany Exp $'
 !
 
 version_SVN
-    ^ '$Id: Tools__BreakpointService.st,v 1.59 2015-02-16 12:08:50 cg Exp $'
+    ^ '$Id: Tools__BreakpointService.st,v 1.60 2015-02-24 08:25:36 vrany Exp $'
 ! !