CONNECT segfault fix