Potential fix for #2250