Fix the date formating