avoid possibly invalidated iterators
Authored by: David Tardon 2017-09-07
Parent: [0329a9]
Child: [d09bcb]