Fix the date problem