Fix bug when token is filtered