Fixup time span issues again