Fix #396 - Replaced CopyOnWriteArraylist by iterator.