Fix the Criteria validator issue