Responder fix