Fix retain cycle problem