by Jinqn
by Jinqn 修复俩个bug