Fix similar problem for Token