Hotfix for memory-control nullptr bug