Fix bug with VALIDATOR