Workaround for bug in Visual Studio