Fix unexpected undying