Bug fix for token.