Bugfix: Memory Management