fix token problem