fixed ownership issues