Small tweak for map