diff --git a/src/helma/objectmodel/db/Property.java b/src/helma/objectmodel/db/Property.java
index 33468c43..d933c5b2 100644
--- a/src/helma/objectmodel/db/Property.java
+++ b/src/helma/objectmodel/db/Property.java
@@ -45,9 +45,11 @@ public final class Property implements IProperty, Serializable, Cloneable {
 	        value = in.readBoolean () ? Boolean.TRUE : Boolean.FALSE;
 	        break;
 	    case INTEGER:
-	    case DATE:
 	        value = new Long (in.readLong ());
 	        break;
+	    case DATE:
+	        value = new Date (in.readLong ());
+	        break;
 	    case FLOAT:
 	        value = new Double (in.readDouble ());
 	        break;
@@ -79,9 +81,11 @@ public final class Property implements IProperty, Serializable, Cloneable {
 	    out.writeBoolean (((Boolean) value).booleanValue());
 	    break;
 	case INTEGER:
-	case DATE:
 	    out.writeLong (((Long) value).longValue());
 	    break;
+	case DATE:
+	    out.writeLong (((Date) value).getTime());
+	    break;
 	case FLOAT:
 	    out.writeDouble (((Double) value).doubleValue());
 	    break;