refix bug 54968660
re fix bug 54968660