Fixed issue with tokens