Survivor is a true warrior

Fix on the way for crash hot spot