Improve evil check