fixing membership scenarios