- Fixed possible memleak