Fix what look like a longstanding bug in ETA computation.