Merge pull request #1705 from arrbee/avoid-index-double-free Try harder not to double free index entries