Fix to get break iterators working