Fix further leaking :(