Fix delimiting to be more flexible with input