Fix request handling