Small change to validator