Fixed an issue with tokens