fixed bug 1740