adjust to [functor] API changes