[FOLD] Validators fix