fixed problems with timespan