Fixed the timer issue