Fixed issue with handshake