Count watchers fix