Merge pull request #2154 from ZappoMan/warningsfix

fix warning
fix warning