Leaking memory Fix 2