removed default response check