fixing-issue-902
Merge pull request #903 from yilongli/fixing-issue-902

fixing issue #902