fixed bug 1736