Ownership bug fix.