Try to avoid a java.util.ConcurrentModificationException that's popping up on 5.5.5