FIXED: key exchange issue