Fix to work with latest 3.5 Membership version