fix finish crash on retry