New fix for Windows build