fix issue 1535
Merge pull request #1585 from dongzha/issue1535New

fix issue #1535 new