Fixed bug with ConcurrentModifications