different handling of token iterator