fix bug 001 by xw