#162 More memory again