Hotfix/memdietbugfix