Fix memory leak !!!