Time track + fix