Simplify check a little bit