- fixed bug in Tokenization