fixed bug 1795