Hotfix, UI and connection separated.