Fixed bug with Windows