fix timespan issues