Fixed previous validation method