Fix to work with latest 3.5.x Membership version