Another quick fix for Windows