Adding the "map" of #1110