Fix for double-free and segfault after close