fix the timer issue