Modify to support longer delimiters without slowing it down too much