Revert "Revert "Fix build warning""
Merge pull request #3765 from highfidelity/revert-3763-revert-3762-fix-build-warning

Revert "Revert "Fix build warning""