Before memLeak fix