Do this check earlier