Fix owner pickup code