Check and Fix some issue#1535
Merge pull request #1543 from dongzha/Fix1535

Check and Fix some issue #1535