Fixed split issue for tokenizer