fix finish issue