Bug fixed (memory leak)