fix: token detection and import (#23798)

fix: token detection and import (#23798) #942