Fix count including overlord & whitespace