Trying to fix concurrentmodificationexception..