Added fix for Visual Studio platform