diff --git a/Documentation/ChangeLog b/Documentation/ChangeLog
index e86a985..55d49fe 100644
--- a/Documentation/ChangeLog
+++ b/Documentation/ChangeLog
@@ -1,3 +1,11 @@
+2005-02-12 Pascal Hoftsee <caelian@gmail.com>
+  	   Committed by Gregory Jonh Casamento <greg_casamento@yahoo.com>
+	
+	* Library/PCButton.m: Corrected issue in 
+	-[PCButton _updateTrackingRects:] which was causing a SIGBUS
+	to occur on FreeBSD by simply moving the remove method call below
+	the line which was referencing the rect.
+	
 2005-01-26 Serg Stoyan <stoyan255@ukr.net>
 
 	* Release 0.4.2
diff --git a/Library/PCButton.m b/Library/PCButton.m
index dee98ba..eab9ca4 100644
--- a/Library/PCButton.m
+++ b/Library/PCButton.m
@@ -111,11 +111,11 @@
   for (i = 0; i < j; i++)
     {
       tr = [_tracking_rects objectAtIndex:i];
-      [self removeTrackingRect:tr->tag];
 
 //      NSLog(@"PCButton: tr: %i data: %@", tr->tag, tr->user_data);
 
       string = [(NSString *)tr->user_data copy];
+      [self removeTrackingRect:tr->tag];
 
       rect = [self frame];
       rect.origin.x = 0;