=potential fix for #970