Fixed bug for windows