Fix for bug 851.