builds with MSVC C++ again