diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index 4df04f227..253d708b5 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -973,7 +973,7 @@ _selectorForProperty (NSString *property)
   values = [self _properties: properties ofObject: object];
   currentValue = values;
   property = properties;
-  while (*currentValue)
+  while (*property)
     {
       nodeTag = [self _nodeTag: *property];
       if (*currentValue)
@@ -988,8 +988,8 @@ _selectorForProperty (NSString *property)
 	  propDict = properties404;
 	}
       [properties200 addObject: propertyValue];
-      currentValue++;
       property++;
+      currentValue++;
     }
   free (values);