Properly implement recorder CONNECT, close #1980