Calm down a little on the pin checking