fix bug
Merge pull request #616 from youyong205/master

merge
Merge pull request #617 from jialinsun/master

fix bug