One more msvc fix iteration, the previous one was over-simplified for visual
1 file changed