Fixed more memory leaking