Should this not prefer the token over the raw?