Fixed regex for tokenizer