Fixed potential broken order of date parsing