fix handle last run strategy, improve performance