fix handshake attributes