Fix for bug 3288.