trying to fix handshake