FIXED: import key exchange issue