Fix for #970