Fix for alternative delimiters