Switched back to working method. Patches the problem for our app but cannot change delimiters.