Fixed datetime saving