MSVC fix for newer versions