* tokenizer fixup