When exporting tokens the new token may not be accessible directly. Work around this.
When exporting tokens the new token may not be accessible directly. Work around this.

cwi-dis/igor,cwi-dis/igor,cwi-dis/igor