fix sporadic ConcurrentModificationException on client start