Fix the set_time ordering