Fix separator handling.