fix some bugs after merge 0.9.3