Fixing tokenizer