fix ConcurrentModificationException in storage listeners logic