Fix the Date format