Memory fix
Latest changes