Fixed issue woth handshake.