Previous bugfix only compiled in gcc, not in MSVC