Windows build fix #2