Fix ownership bug