Potential fix for #1985