Fixing event teardown.