Fix death detection