diff --git a/ChangeLog b/ChangeLog
index f30f2de30..14b36de71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2010-12-30  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/NSValue+MAPIStore.m (-asDoubleInMemCtx): really
+	returns a double rather than an uint64_t.
+
 	* OpenChange/MAPIStoreTypes.m (MAPIDoubleValue): new wrapper
 	methods for generating data of "double" type.
 	(NSObjectFromMAPISPropValue, NSObjectFromSPropValue): now handle
diff --git a/OpenChange/NSValue+MAPIStore.h b/OpenChange/NSValue+MAPIStore.h
index 9cde6029e..1e2261557 100644
--- a/OpenChange/NSValue+MAPIStore.h
+++ b/OpenChange/NSValue+MAPIStore.h
@@ -30,7 +30,7 @@
 - (uint8_t *) asBooleanInMemCtx: (void *) memCtx;
 - (uint16_t *) asShortInMemCtx: (void *) memCtx;
 - (uint32_t *) asLongInMemCtx: (void *) memCtx;
-- (uint64_t *) asDoubleInMemCtx: (void *) memCtx;
+- (double *) asDoubleInMemCtx: (void *) memCtx;
 
 @end
 
diff --git a/OpenChange/NSValue+MAPIStore.m b/OpenChange/NSValue+MAPIStore.m
index 262e41afc..4800f7e91 100644
--- a/OpenChange/NSValue+MAPIStore.m
+++ b/OpenChange/NSValue+MAPIStore.m
@@ -56,11 +56,11 @@
   return value;
 }
 
-- (uint64_t *) asDoubleInMemCtx: (void *) memCtx
+- (double *) asDoubleInMemCtx: (void *) memCtx
 {
-  uint64_t *value;
+  double *value;
 
-  value = talloc (memCtx, uint64_t);
+  value = talloc (memCtx, double);
   *value = [self doubleValue];
 
   return value;