Event: Memory Leak bugfix