Fixed (and simplified) ResponseFinder.