fixed bug on finish