Solved minor memory leak