Guoci tokenize fix