Bug verified on Windows 10.

Commit [1b5b347448] fixes the issue for me.

Could you verify if there are any side effects on the fix ?
I have no real idea what I am doing here...

Thank you all,
Harald