Made working (again) on Windows