Fix setting owner not transfering right

My command handler commit needs to be added along with this