Tried to fix ConcurrentModificationException