Fixed rerun issues.