Fix for mem