use_time_for_time fix