fixed broken tokenize