1.8, removed potential memory leak