Move check to the right place