fix bug 20140923