Fix for sending a HANDSHAKE only