- fixed memory problem