fix bug
Merge branch 'liugenjie'