bug in tokenize fixed