bugfix
next_token bugfix