Fix autoconnect