Fixed Windows support