whoops, no longer using map-invert