Adjusted MSVC workaround