Fixed Windows issue