fix bug 54968032