Progress map fix

@david-daal @Gor-Gasp please review!
Do we need `localIndex` local variable?