Fix for RequestHandler.