Resolved memory leak