on finish fix