Fix the fix for token guessing