Fix proper owner overriding