Improve check