Bugfix for windows-specific issues