Another attempt at memory fix, #1