Started to squash memory leak