Fixed takeTokens