fix 961370
Merge pull request #167 from licaiguo/fix-961370

fix 961370 -- review request #50