Fix handshake migration