Fix for Visual Studio