Fixed bug for windows support