finish_fix

bug fix
Merge pull request #1 from test27/master

2
Merge pull request #2 from wzyy2/master

finish_fix