Fixes date saving