Should this not be in the http transport?