Fixed CME (ConcurrentModificationException)