--- a/src/JavaMethod.st	Sun May 13 17:30:17 2012 +0000
+++ b/src/JavaMethod.st	Wed May 30 20:52:34 2012 +0000
@@ -1348,16 +1348,20 @@
 !
 
 clearBreakPoint
+    | clsInEvent |
 
     accessFlags := (accessFlags bitClear:A_BREAKPOINT).
     self hasCode ifTrue:[
         MessageTracer unwrapMethod:self
     ] ifFalse:[
-        Smalltalk changed:#methodTrap with:{ javaClass . selector }
+        clsInEvent := self isStatic 
+                        ifTrue:[ javaClass theMetaclass ]
+                        ifFalse:[ javaClass ].
+        Smalltalk changed:#methodTrap with:{ clsInEvent . selector }
     ]
 
     "Modified: / 13-11-1998 / 23:31:00 / cg"
-    "Modified: / 15-11-2011 / 22:44:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 30-05-2012 / 19:31:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 isCounting
@@ -1373,16 +1377,20 @@
 !
 
 setBreakPoint
+    | clsInEvent |
 
     accessFlags := (accessFlags bitOr:A_BREAKPOINT).
     self hasCode ifTrue:[
         MessageTracer trapMethod:self
     ] ifFalse:[
-        Smalltalk changed:#methodTrap with:{ javaClass . selector }
+        clsInEvent := self isStatic 
+                        ifTrue:[ javaClass theMetaclass ]
+                        ifFalse:[ javaClass ].
+        Smalltalk changed:#methodTrap with:{ clsInEvent . selector }
     ].
 
     "Modified: / 13-11-1998 / 23:30:45 / cg"
-    "Modified: / 15-11-2011 / 22:43:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 30-05-2012 / 19:30:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 setTraceFullPoint