Leakfixing #3