Fix Visual Studio implementation