should close #73, at least on the map