Fixed concurrentmodification exception