Bugfix/overlay memory leak