Fixed Windows Issue