fix the timer crap