Another fix for Windows