WIP: fixed handshake