Bugfix for MS-Win