fix bug
Merge branch 'hongkun'