Potential fix for #2335.