Panic: out of range

[dennis-tra]

@guillaumemichel could you one last time look into this bit of the code?

This part of the code is the most complex one and therefore has repeatedly posed challenges. Would it be possible to add a test or two?

[guillaumemichel]

It seems to be the same error that we have seen and corrected in the past. Somehow the commit isn't included in history. I'll submit a new PR with the change.