Fix bug introduced by CLANG cleanup
Merge pull request #4046 from ktf/fix-clang-bug

Fix clang bug