Fixed: Potential "ConcurrentModificationError" issue