fixed bug 1813