Fix last run bug