fix token issue