Fixed memory leak again