Fixed date/time to save correctly