Fix intermittent memberships failure