Fix the ownership problem.