Fixed for Windows