Fixed take ownership issue