fix #2101
Merge pull request #2102 from guangyang/release-0.7.1

fix #2101