Bugfix Memory