fix token issue [Fixes 44063309]