Part of a fix for bug 445.