TOON: Fix memory leak