fixed bug 1223922