fix finish order