fixed bug 1822