Minor improvement to the idle handling