Fixed for Visual Studio