Fixed the date parsing