fix bug 54968166