Fixed a bug with the tokens