Fixed bug on win, added to support