fixing the token lookup.