Fixed ownership bug