fixed memory use
fixed memory use, again