fix timers issues