delete it->second must be previous operation before set.erase<> #25
Merge branch 'bug_25' into develop