### Bug Fix * Fix memory leak