Validator fixed