Windoes bugfix