REF: Get fill-map-vector working properly