#786 Fixed Windows bug (2)