Fix handshake call