Somewhat improve rare error