fixed bug 1733