More memory leak fixed.