Bugfix: Memory leak