Restore compatibility with MSVC