Improve check.