Work in progress: fix progress map.