fix request handling