Fix token problem