Fix one more issue with event modification

I'm afraid all this code is disposable...