DRAFT of fix for INVISIBLE_MEMBER

Accept this or else