map update from #987