Fix timer issue