Fix Date Saving