Fixed: a safer way to die... maybe