Fix token invalidation by a function down the stack (#290)

Fix token invalidation by a function down the stack (#290) #47