Making MSVC happy again