making rerun a little more robust