fix event leaks