Fix key exchange