make sure that the iterated lambda doesn't touch the indx
Merge branch 'master' into mac