diff --git a/SOPE/NGCards/CardElement.m b/SOPE/NGCards/CardElement.m
index 9767359b6..b3ccea5d4 100644
--- a/SOPE/NGCards/CardElement.m
+++ b/SOPE/NGCards/CardElement.m
@@ -314,7 +314,7 @@
     [self addValue: newValue];
   else
     {
-      if (aValue)
+      if ([aValue length])
         [self setValue: index to: newValue];
       else
         [values removeObjectAtIndex: index];
diff --git a/SOPE/NGCards/ChangeLog b/SOPE/NGCards/ChangeLog
index 8fd11bd86..d6521f136 100644
--- a/SOPE/NGCards/ChangeLog
+++ b/SOPE/NGCards/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-08  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* CardElement.m ([CardElement
+	-setNamedValue:aValueNameto:aValue]): if the value is empty, we
+	removed the named value.
+
 2008-01-28  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* iCalRecurrenceRule.m ([iCalRecurrenceRule
diff --git a/SOPE/NGCards/iCalRecurrenceRule.m b/SOPE/NGCards/iCalRecurrenceRule.m
index afeb28d0d..006e46365 100644
--- a/SOPE/NGCards/iCalRecurrenceRule.m
+++ b/SOPE/NGCards/iCalRecurrenceRule.m
@@ -251,9 +251,16 @@
   [self setNamedValue: @"wkst" to: _weekStart];
 }
 
+#warning we also should handle the user weekstarts
 - (NSString *) wkst
 {
-  return [self namedValue: @"wkst"];
+  NSString *start;
+
+  start = [self namedValue: @"wkst"];
+  if (![start length])
+    start = @"SU";
+
+  return start;
 }
 
 - (void) setWeekStart: (iCalWeekDay) _weekStart
@@ -359,7 +366,7 @@
 	case 'S':
 	  if (chars[1] == 'A')
 	    foundDay = iCalWeekDaySaturday;
-	  else if (chars[1] == 'H')
+	  else if (chars[1] == 'U')
 	    foundDay = iCalWeekDaySunday;
 	}
     }