Fix for #972