Hopefully fixed the timer issue