Final version of the bugfix for 572

Fixes #572
Improves upon #573 
ah indeed. Why not indexing it numerically at this point ?