Solution for #395 Mapmaker