fix Issue #709
Merge pull request #710 from alan125/master

fix Issue #709