fixed ownership bugs