Potential fix for #1058