Fix: an issue with Timer...