Fix owner usage (OMS-467)