fix tuple problem with token