fix request handler