Bugfix for Windows