fix bug 54968500