Fixing first responder