Potential fix for #731