Fixed indexing done by @awodey, he should review my changes, as I did his, cf. #94