Fixed the Timer class