Fix timestamp persisted data