Potential fix for #1057