Don't invalidate iterators again!
Merge pull request #460 from igorko/master

Don't invalidate iterators again!