Fixed remove on iterators skipping the substiting element.