Modified validation check