Fixed corner cases in continuation (start and end of an iteration)
Merge branch 'bz2'