[#1376] memory fix