[Windows] Fixing complication errors for WINDOWS.
Merge pull request #3090 from dumganhar/develop

[Windows] Fixing complication errors for WINDOWS.