Fixed bug with stale token count