Progress map fix

@david-daal @Gor-Gasp please review!