CONNECT bug fix