fix bug 54968386