fixed bug 1801