Fixing regex so that tokenizer can work properly