diff --git a/SOPE/NGCards/ChangeLog b/SOPE/NGCards/ChangeLog
index 8a9e6fb3c..e176b447f 100644
--- a/SOPE/NGCards/ChangeLog
+++ b/SOPE/NGCards/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-20  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* iCalToDo.m (-setCompleted:):  (hack) when invoked with a nil
+	argument, we set the status "back" to "IN-PROCESS" as we otherwise
+	may end up with a "COMPLETED" task without a completion date.
+
 2011-07-12  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* iCalCalendar.m (-addTimeZone:): now returns true if the timezone
diff --git a/SOPE/NGCards/iCalToDo.m b/SOPE/NGCards/iCalToDo.m
index 915589b74..21a01560b 100644
--- a/SOPE/NGCards/iCalToDo.m
+++ b/SOPE/NGCards/iCalToDo.m
@@ -72,7 +72,10 @@
 {
   [(iCalDateTime *) [self uniqueChildWithTag: @"completed"]
 		    setDate: newCompletedDate];
-  [self setStatus: @"COMPLETED"];
+  if (newCompletedDate)
+    [self setStatus: @"COMPLETED"];
+  else
+    [self setStatus: @"IN-PROCESS"];
 }
 
 - (NSCalendarDate *) completed