fixing token count