Probable fix for bug 2883.