patch for bizarre ConcurrentModificationException that I've never seen before !