Fixed memory leak in 1.5