Performance tweak

slight move, of when things are checked