FIxed "memory leak"