fixed issue w/ memoization using tokens.