- Fixed dumb mistake (ordering of checks)