fix ConcurrentModificationException in getBootstrapSource
merge from 1.1