fix manage.map arguments, too