Fix indexing (again)
Fix indexing (again)

Incorrect manual testing confused me and thought that the initial fix was
incorrect. This is simply because there is no written test for this -
which at some point I should add.

aedart/scaffold,aedart/scaffold