Fix ans_key exchange in recent changes