rev. 1.3.3 - fix for ConcurrentModificationException