fix for token