One more re-run feature fixed