Hotfix for autoconnection