Fix membership with race registration