fix the timer issus