Bug fix - delegate not deallocated