fixed bug 2395