Delimiter support
Revert "Fix bug"

This reverts commit cc6f01c729989d594355ba5286e59b90af567354.