Fix java.util.ConcurrentModificationException for "gaiden watch"