am 6e466a1b: Fixing ConcurrentModificationException.

* commit '6e466a1b87ce163a48fccea69e8b8f16ef36eee7':
  Fixing ConcurrentModificationException.