partial fix for bug 1891