fixed bug 1900