Resolved #1 fixed the leakage