dfix
Fix bug with token string lexing