fix for bug 1813