Better handling on windows