Fixed biggest memory leak