Try to fix kvo leaking