Autoconnect: bug fix