Trying to fix bug on Windows