fix bug 54968900