Fix map-traversal-dispatch-map