fixed memory use, again