Compile MSVC
Fix bug in 153123a