[modified] fix some bugs[chenyen]