Fix "one too often" fail-over