Moved stranded counts check to a more sensible place..