First responder fix