- Fixed possible memory leak