Fix broken key exchange