diff --git a/ChangeLog b/ChangeLog
index 33829da00..1f0887e46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-04-04  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/Scheduler/UIxCalListingActions.m
+	(-_fillBlocks:withEvent:withNumber:): fixed type confusion between
+	char * and NSString * that could cause a crash under certain
+	circumstances.
+
 2011-04-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* Tests/Unit/TestSBJsonParser.m (-test_parseJSONString): input and
diff --git a/UI/Scheduler/UIxCalListingActions.m b/UI/Scheduler/UIxCalListingActions.m
index 63ca20c42..cbe79cf3b 100644
--- a/UI/Scheduler/UIxCalListingActions.m
+++ b/UI/Scheduler/UIxCalListingActions.m
@@ -702,7 +702,7 @@ _userStateInEvent (NSArray *event)
             offset = ((currentStart - startSecs)
                       / dayLength);
           if (offset >= [blocks count])
-            [self errorWithFormat: "event '%@' has a computed offset that"
+            [self errorWithFormat: @"event '%@' has a computed offset that"
                   @" overflows the amount of blocks (skipped)",
                   [event objectAtIndex: eventNameIndex]];
           else