Fixed windows issue