Fixed handshake again