Fix logic to start/stop timers for different cases