Fix for #974