Another fix for Windows build