Fixed event leak

fixed event leak:

- [x] test coverage
- [x] gather feedback for my changes
- [x] submit changes to the documentation


| Q             | A
| ------------- | ---
| Bug fix?      |yes
| New feature?  | no
| Tests pass?   | yes
| Fixed tickets | none
| Doc           | none