handshake fixed