I think this has revealed a bug in our forward reading code. I'll have to look into it, but it shouldn't be related to this PR so maybe better to handle subsequently...