fixed support for windows machines