More inclusive check