Trying to work around issue #285 on Windows