Fix for first responder