Fixed the validator