fixed bug 1857