Fix ownership case claiming issue