fix for core key exchange