Potential fix for #1369