Hopefully fixed expose issues on some Windows machines