responder fixes