Fix seconds measure. Also support new format.