Fix separator issue