try to fix finish bug