Fix for #772