#681: Fix the date validator issue