Proper fix for UnknownMember bug