Small change to validation