Reduced the scope of the event handler to a single request.