Match the new behaviour of TimeSeries