Merge pull request #2156 from ZappoMan/warningsfix

fix warning