don't we also need to do this for subrequests?