Restore compatibility with MSVC
Restore compatibility with MSVC