Fix order of indexed parameters
Merge branch 'ordering'