Hotfix: Fixed memory glitch

But probably not completely fixed, still working on this
on hotfix branch