Fix/memory leak