restoring MSVC support