Fixed ownership issue