fixed bug 2626