fix token binding