fixed bug 1792