fix numbering on token refs