Potential fix for #1168