Fix for #889.