Fix for bug 2623.