First try to fix the memory leak from #14