hezhuoqun bugfix and optimize