Fix problem with date parse