Fixed delimeter bugs