fix some bugs，please check it.