Temporary fix for bug "Date Validation gives errors"