Fixed rerun issues