@ahorek This does look like the right fix. The failed path can be followed normally from the various break in the switch, but it needs an additional trigger at the top of the loop.

I'll merge and add some comments about why this code is duplicated.