Fixed possible (?) memory leak