Fixed concurrentmodificationexception