Fixing tokenizer to choose maximal match