Fix that we try to save the result even when re-run is not completed