Fix addTokens fnc