Fix time-grid support