fixed bug 1737