Added fix for tabbing past time variables