Fix owner problem