Fix so that token can get displayed more than once