key exchange fix