Fixing Compiler Error C2466
Merge pull request #4810

c0f5d4a Fixing Compiler Error C2466 (ENikS)