Try to fix the memory leak...