The very last'est invalid-iterator fix