fixed some issues
Merge pull request #11886 from ra1028/master

fixed some issues