Adapt to managed_by change