Properly use the time_left when available