Validation check fixed