fixed bug 1759