Fix bug with time_based run