Date check fix