fixed upstream, fix fatal on remove from groups