<DE2> Fix bugs caused by memory manager
<DE2> For last commit