Fixed "ConcurrentModification (#4)"?