Fixed memory leak due to cell-rendering