Fixes psycho bug from hell #2
An iterator to one container was used to change another. Hell resulted.