Improve a check a little