fix map, sort of