Fix for token handler