Hotfix/reset separators properly