Fix for TimeIndexing