Fix handshake issue