I think we also need to do this in `requestHandler`