Will fix with weak reference