Leakfixing, hopefully the last (#6)