fix cell leaks