Fix ConcurrentModificationException

Authored by albertvaka on Apr 17 2020, 8:05 PM.